Updated for ActionBar API changes
Change-Id: I20d162c2921b1d8797594b162aaafd4a72aae607
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 57bcb91..b0ba7dc 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -46,7 +46,7 @@
<item name="android:height">48dip</item>
<item name="android:padding">0dip</item>
<item name="android:background">@drawable/tabbar_bg</item>
- <item name="android:displayOptions">hideHome</item>
+ <item name="android:displayOptions"></item>
</style>
<style name="ActionButton">
<item name="android:background">@drawable/browserbarbutton</item>
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 639a75b..1a8e325 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1260,11 +1260,11 @@
}
@Override
- public ActionMode onStartActionMode(ActionMode.Callback callback) {
- mActionMode = super.onStartActionMode(callback);
+ public void onActionModeStarted(ActionMode mode) {
+ super.onActionModeStarted(mode);
hideFakeTitleBar();
// Would like to change the MENU, but onEndActionMode may not be called
- return mActionMode;
+ // TODO onActionModeFinished will notify when an action mode ends
}
@Override