summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-02-11 15:44:17 -0800
committerJohn Reck <jreck@google.com>2011-02-14 10:37:05 -0800
commit285ef044bb1098b3bf318a65fe6a86c93b2365b0 (patch)
treecaa86eeebc1a0605e0e754fd1abeaaefad847643 /src/com/android
parentb3b653b821c2e7ef948925992b6bb6a83c2f923b (diff)
downloadpackages_apps_Browser-285ef044bb1098b3bf318a65fe6a86c93b2365b0.tar.gz
packages_apps_Browser-285ef044bb1098b3bf318a65fe6a86c93b2365b0.tar.bz2
packages_apps_Browser-285ef044bb1098b3bf318a65fe6a86c93b2365b0.zip
Fix crash when opening bookmarks on phone
Change-Id: I862c52000e2f3f414e1064a66c922dc9e924bc88
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/CombinedBookmarkHistoryView.java2
-rw-r--r--src/com/android/browser/PhoneUi.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 686e646c0..f1b9e2460 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -170,7 +170,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout
mTabHistory.setTabListener(this);
mActionBar.addTab(mTabHistory, FRAGMENT_ID_HISTORY == startingFragment);
mActionBar.setCustomView(mBookmarksHeader);
-
+ mActionBar.show();
}
@Override
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 7463ca5dc..73c1b9998 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -48,7 +48,13 @@ public class PhoneUi extends BaseUi {
// mTitleBar will be always be shown in the fully loaded mode on
// phone
mTitleBar.setProgress(100);
+ mActivity.getActionBar().hide();
+ }
+ @Override
+ public void hideComboView() {
+ super.hideComboView();
+ mActivity.getActionBar().hide();
}
// webview factory