diff options
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 0fe96f99e..b4b3d9052 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1025,6 +1025,7 @@ public abstract class PhotoPage extends ActivityState implements @Override protected void onBackPressed() { showBars(); + ((GalleryActivity)mActivity).toggleNavBar(true); if (mShowDetails) { hideDetails(); } else if (mAppBridge == null || !switchWithCaptureAnimation(-1)) { @@ -1043,10 +1044,7 @@ public abstract class PhotoPage extends ActivityState implements mActionBar.setBackGroundDefault(); int count = mActivity.getStateManager().getStateCount(); if (mIsFromVideoScreen || count == 1 || mIsFromTimelineScreen) { - mActivity.getToolbar().setNavigationContentDescription( - "drawer"); - mActivity.getToolbar().setNavigationIcon(R.drawable.drawer); - ((GalleryActivity)mActivity).toggleNavDrawer(true); + ((GalleryActivity)mActivity).toggleNavBar(true); if (mModel instanceof PhotoDataAdapter) { ((PhotoDataAdapter) mModel).setDataListener(null); } @@ -1681,12 +1679,11 @@ public abstract class PhotoPage extends ActivityState implements } mActionBar.setDisplayOptions( - ((mSecureAlbum == null) && (mSetPathString != null)), true); + (false && (mSetPathString != null)), true); mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); refreshBottomControlsWhenReady(); if (((mSecureAlbum == null) && (mSetPathString != null))) { - mActivity.getToolbar().setNavigationContentDescription("back"); - mActivity.getToolbar().setNavigationIcon(R.drawable.back); + ((GalleryActivity)mActivity).toggleNavBar(false); } // if (mShowSpinner && mPhotoView.getFilmMode()) { // mActionBar.enableAlbumModeMenu( |