diff options
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 080dfbab4..874670e83 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -285,7 +285,10 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster if (mInCameraApp) { GalleryUtils.startGalleryActivity(mActivity); } else if (mActivity.getStateManager().getStateCount() > 1) { - ((GalleryActivity) mActivity).toggleNavBar(true); + Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + ((GalleryActivity) mActivity).toggleNavBar(true); + } super.onBackPressed(); } else if (mParentMediaSetString != null) { Bundle data = new Bundle(getData()); @@ -794,10 +797,14 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster case SelectionManager.ENTER_SELECTION_MODE: { mActionModeHandler.startActionMode(); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + ((GalleryActivity) mActivity).toggleNavBar(false); break; } case SelectionManager.LEAVE_SELECTION_MODE: { mActionModeHandler.finishActionMode(); + if (mActivity.getStateManager().getStateCount() <= 1) { + ((GalleryActivity) mActivity).toggleNavBar(true); + } mRootPane.invalidate(); updateMenuItem(); break; |