summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-11-11 15:13:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 15:13:53 +0000
commitfb718f1bd68ebfd77a43bda59a9f54ec3f155bef (patch)
tree5df4c309bf117e921dfa88ee871236031382b846 /src
parentacc7cd92d3bc32d7ca0160bc685f325d1e427827 (diff)
parentccd78601a934cf1ffafe5854a1d465c273727f69 (diff)
downloadpackages_apps_browser-fb718f1bd68ebfd77a43bda59a9f54ec3f155bef.zip
packages_apps_browser-fb718f1bd68ebfd77a43bda59a9f54ec3f155bef.tar.gz
packages_apps_browser-fb718f1bd68ebfd77a43bda59a9f54ec3f155bef.tar.bz2
am ccd78601: Merge "Set home button enabled" into ics-mr1
* commit 'ccd78601a934cf1ffafe5854a1d465c273727f69': Set home button enabled
Diffstat (limited to 'src')
-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);
}