summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-08-14 16:44:51 -0700
committerAngus Kong <shkong@google.com>2013-08-14 16:44:51 -0700
commit7e1c5fe26bc861d979b85014a511ba35bc1f4110 (patch)
treeb8e2dea207b0e6c58e408af56d5f856cb4837d71
parent0689254ef810c502c65852a7c54bf902e975b38a (diff)
downloadandroid_packages_apps_Snap-7e1c5fe26bc861d979b85014a511ba35bc1f4110.tar.gz
android_packages_apps_Snap-7e1c5fe26bc861d979b85014a511ba35bc1f4110.tar.bz2
android_packages_apps_Snap-7e1c5fe26bc861d979b85014a511ba35bc1f4110.zip
Single tap to full screen mode.
bug:10308911 Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
-rw-r--r--src/com/android/camera/ui/FilmStripView.java23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index d6bfe3718..dd5c29eb9 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1591,24 +1591,6 @@ public class FilmStripView extends ViewGroup {
@Override
public boolean onSingleTapUp(float x, float y) {
if (inFilmStrip()) {
- for (int i = 0; i < BUFFER_SIZE; i++) {
- if (mViewInfo[i] == null) {
- continue;
- }
-
- if (mViewInfo[i].areaContains(x, y)) {
- mController.scrollTo(mViewInfo[i].getCenterX(),
- DURATION_GEOMETRY_ADJUST, false);
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean onDoubleTap(float x, float y) {
- if (inFilmStrip()) {
ViewInfo centerInfo = mViewInfo[mCurrentInfo];
if (centerInfo != null && centerInfo.areaContains(x, y)) {
mController.gotoFullScreen();
@@ -1622,6 +1604,11 @@ public class FilmStripView extends ViewGroup {
}
@Override
+ public boolean onDoubleTap(float x, float y) {
+ return false;
+ }
+
+ @Override
public boolean onDown(float x, float y) {
if (mController.isScrolling()) {
mController.stopScrolling();