summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/PhotoMenu.java1
-rw-r--r--src/com/android/camera/VideoMenu.java1
-rw-r--r--src/com/android/camera/ui/ListMenu.java4
3 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index d77d900..879b377 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1031,6 +1031,7 @@ public class PhotoMenu extends MenuController
public void onListMenuTouched() {
mUI.removeLevel2();
+ mPopupStatus = POPUP_FIRST_LEVEL;
}
public void closeAllView() {
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index a792be2..196adba 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -751,6 +751,7 @@ public class VideoMenu extends MenuController
public void onListMenuTouched() {
mUI.removeLevel2();
+ mPopupStatus = POPUP_FIRST_LEVEL;
}
public void closeAllView() {
diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java
index 80a00a7..bb21f7e 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -220,6 +220,10 @@ public class ListMenu extends ListView
@Override
public boolean onTouchEvent(MotionEvent ev) {
+ if (ev.getAction() == MotionEvent.ACTION_MOVE) {
+ mListener.onListMenuTouched();
+ resetHighlight();
+ }
return super.onTouchEvent(ev);
}