diff options
Diffstat (limited to 'src')
7 files changed, 25 insertions, 19 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index c3ef4c326..4f3f34814 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()); @@ -797,10 +800,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; diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 2b87f97b4..7eaa2bc6a 100755 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -278,6 +278,13 @@ public class AlbumSetPage extends ActivityState implements } private void pickAlbum(int slotIndex) { + if (mActivity.getStateManager().getStateCount() >= 1) { + android.widget.Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + ((GalleryActivity) mActivity).toggleNavBar(false); + } + } + if (!mIsActive) return; MediaSet targetSet = mAlbumSetDataAdapter.getMediaSet(slotIndex); @@ -701,12 +708,12 @@ public class AlbumSetPage extends ActivityState implements //mActionBar.disableClusterMenu(true); mActionModeHandler.startActionMode(); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); - ((GalleryActivity)mActivity).toggleNavBar(false); + ((GalleryActivity) mActivity).toggleNavBar(false); break; } case SelectionManager.LEAVE_SELECTION_MODE: { mActionModeHandler.finishActionMode(); - ((GalleryActivity)mActivity).toggleNavBar(true); + ((GalleryActivity) mActivity).toggleNavBar(true); /*if (mShowClusterMenu) { mActionBar.enableClusterMenu(mSelectedAction, this); }*/ @@ -732,13 +739,11 @@ public class AlbumSetPage extends ActivityState implements mDetailsHelper.hide(); mAlbumSetView.setHighlightItemPath(null); mSlotView.invalidate(); - ((GalleryActivity)mActivity).toggleNavBar(true); } private void showDetails() { mShowDetails = true; if (mDetailsHelper == null) { - ((GalleryActivity)mActivity).toggleNavBar(false); mDetailsHelper = new DetailsHelper(mActivity, mRootPane, mDetailsSource); mDetailsHelper.setCloseListener(new CloseListener() { @Override diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index d4b508782..04892378a 100755 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -206,13 +206,8 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On if (show) { mBottomNavigation.setVisibility(View.VISIBLE); } else { - mBottomNavigation.setVisibility(View.INVISIBLE); + mBottomNavigation.setVisibility(View.GONE); } - - // Convert dp to pixels - float dp = getApplicationContext().getResources().getDisplayMetrics().density; - - params.setMargins(0, 0, 0, show ? Math.round(56 * dp) : 0); } public void showScreen(int position) { diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 76bd5db6d..6108c8e3d 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1025,7 +1025,6 @@ 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)) { @@ -1044,7 +1043,7 @@ public abstract class PhotoPage extends ActivityState implements mActionBar.setBackGroundDefault(); int count = mActivity.getStateManager().getStateCount(); if (mIsFromVideoScreen || count == 1 || mIsFromTimelineScreen) { - ((GalleryActivity)mActivity).toggleNavBar(true); + ((GalleryActivity) mActivity).toggleNavBar(true); if (mModel instanceof PhotoDataAdapter) { ((PhotoDataAdapter) mModel).setDataListener(null); } @@ -1669,7 +1668,7 @@ public abstract class PhotoPage extends ActivityState implements mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); refreshBottomControlsWhenReady(); if (((mSecureAlbum == null) && (mSetPathString != null))) { - ((GalleryActivity)mActivity).toggleNavBar(false); + ((GalleryActivity) mActivity).toggleNavBar(false); } // if (mShowSpinner && mPhotoView.getFilmMode()) { // mActionBar.enableAlbumModeMenu( diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index 2923ee998..29df60687 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -176,7 +176,9 @@ public class SlideshowPage extends ActivityState { @Override public void onPause() { super.onPause(); - ((GalleryActivity) mActivity).toggleNavBar(true); + if (mActivity.getStateManager().getStateCount() <= 1) { + ((GalleryActivity) mActivity).toggleNavBar(true); + } mIsActive = false; mModel.pause(); mSlideshowView.release(); diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index 7810a1522..a9abc81ff 100755 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -697,12 +697,12 @@ public class TimeLinePage extends ActivityState implements case SelectionManager.ENTER_SELECTION_MODE: { mActionModeHandler.startActionMode(); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); - ((GalleryActivity)mActivity).toggleNavBar(false); + ((GalleryActivity) mActivity).toggleNavBar(false); break; } case SelectionManager.LEAVE_SELECTION_MODE: { mActionModeHandler.finishActionMode(); - ((GalleryActivity)mActivity).toggleNavBar(true); + ((GalleryActivity) mActivity).toggleNavBar(true); mRootPane.invalidate(); break; } diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index bc8f7d8ee..5b1aa844c 100755 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -436,8 +436,6 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On if (mCurrentEditor.showsActionBar()) { setActionBar(); showActionBar(true); - } else { - showActionBar(false); } if (representation.getFilterType() == FilterRepresentation.TYPE_WATERMARK_CATEGORY) { |