summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-11-11 11:49:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 11:49:51 -0800
commit9a67e14fc41c439458f65075fabf1b2cbd31c1fc (patch)
tree4fa5045676821c736a2eb1a59e0ad7b027cc95c0
parentae920d0b87edc9db2cb30d07c15a72a1bdc94ab1 (diff)
parentccd78601a934cf1ffafe5854a1d465c273727f69 (diff)
downloadpackages_apps_browser-9a67e14fc41c439458f65075fabf1b2cbd31c1fc.zip
packages_apps_browser-9a67e14fc41c439458f65075fabf1b2cbd31c1fc.tar.gz
packages_apps_browser-9a67e14fc41c439458f65075fabf1b2cbd31c1fc.tar.bz2
am ccd78601: Merge "Set home button enabled" into ics-mr1
* commit 'ccd78601a934cf1ffafe5854a1d465c273727f69': Set home button enabled
-rw-r--r--src/com/android/browser/ComboViewActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index ae49898..2d382cb 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -63,6 +63,7 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall
if (BrowserActivity.isTablet(this)) {
bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME
| ActionBar.DISPLAY_USE_LOGO);
+ bar.setHomeButtonEnabled(true);
} else {
bar.setDisplayOptions(0);
}