summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/FilmStripView.java
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-10-08 22:34:02 -0700
committerAngus Kong <shkong@google.com>2013-10-09 08:32:43 -0700
commit6ddd31b9284bbbfcf891766f9d6238bfd5cde721 (patch)
treed90981df88d3d7cb36e0e44d63d3a66f7430e73d /src/com/android/camera/ui/FilmStripView.java
parentb04dcdb5cea6ac42f8ba0d699dc45e965d104a5e (diff)
downloadandroid_packages_apps_Snap-6ddd31b9284bbbfcf891766f9d6238bfd5cde721.tar.gz
android_packages_apps_Snap-6ddd31b9284bbbfcf891766f9d6238bfd5cde721.tar.bz2
android_packages_apps_Snap-6ddd31b9284bbbfcf891766f9d6238bfd5cde721.zip
Enter fullscreen if all items are removed.
bug:11066937 Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
Diffstat (limited to 'src/com/android/camera/ui/FilmStripView.java')
-rw-r--r--src/com/android/camera/ui/FilmStripView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 2e3193c73..d8c166004 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1473,6 +1473,11 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
slideViewBack(mViewItem[i]);
}
}
+ if (mCenterX == mViewItem[mCurrentItem].getCenterX()
+ && getCurrentViewType() == ImageData.VIEW_TYPE_STICKY) {
+ // Special case for scrolling onto the camera preview after removal.
+ mController.goToFullScreen();
+ }
int transY = getHeight() / 8;
if (removedView.getTranslationY() < 0) {