diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-19 15:14:53 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-09-19 15:14:53 -0700 |
| commit | 56bdcb7272f222fde5e4c6fc133cb490b31c7667 (patch) | |
| tree | d466c0042e4c48c19c2c1f5749860d140854e23c /src | |
| parent | f5af22101142aec7b73323f3c07909833daf27a5 (diff) | |
| download | android_packages_apps_Gallery2-56bdcb7272f222fde5e4c6fc133cb490b31c7667.tar.gz android_packages_apps_Gallery2-56bdcb7272f222fde5e4c6fc133cb490b31c7667.tar.bz2 android_packages_apps_Gallery2-56bdcb7272f222fde5e4c6fc133cb490b31c7667.zip | |
Make ActionBar always present in filmstrip
Bug: 7196718
Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 75fcb2a47..0d61f2f66 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -585,7 +585,9 @@ public class PhotoPage extends ActivityState implements private boolean canShowBars() { // No bars if we are showing camera preview. - if (mAppBridge != null && mCurrentIndex == 0) return false; + if (mAppBridge != null && mCurrentIndex == 0 + && !mPhotoView.getFilmMode()) return false; + // No bars if it's not allowed. if (!mActionBarAllowed) return false; diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index c47bccc27..b30d70a95 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -1288,9 +1288,9 @@ public class PhotoView extends GLView { mFilmMode ? Model.FOCUS_HINT_PREVIOUS : Model.FOCUS_HINT_NEXT); mListener.onFilmModeChanged(enabled); boolean isCamera = mPictures.get(0).isCamera(); - if (isCamera) { + if (isCamera && !enabled) { // Move into camera in page mode, lock - if (!enabled) mListener.lockOrientation(); + mListener.lockOrientation(); mListener.onActionBarAllowed(false); } else { mListener.onActionBarAllowed(true); |