commit feef78c1ecf63c88e052698040e809f25ffef0c4
author Pin Ting <pinting@google.com> Sun Feb 05 22:24:13 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Feb 05 22:24:13 2012 -0800
tree 8c5da11a1409d25964dd4354455c8a72fa9f8c0a
parent 3f68238643791c0cba312df8549d5dfcd1ef188c
parent 60e1f075be818f37472607cee30a88cf3cd87c30

Merge "Shows status bar in gallery when in portrait view."

src/com/android/gallery3d/app/ActivityState.java

diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 1563a09..48ee9fe 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -146,7 +146,8 @@
             actionBar.setDisplayOptions(
                     stateCount == 1 ? 0 : ActionBar.DISPLAY_HOME_AS_UP,
                     ActionBar.DISPLAY_HOME_AS_UP);
-            actionBar.setHomeButtonEnabled(true);
+            actionBar.setHomeButtonEnabled(
+                    (actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0);
         }
 
         activity.invalidateOptionsMenu();