summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-02-03 11:22:30 -0800
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:45 -0700
commit26d9ea2ff654dfe0f327125d7ef8dda7d96fd5c9 (patch)
treea4ee2151516d2b4810c0539c97f293d0f9cdd698 /src
parentd1712aad3d7570a238511c4a30773d4e1732c8c2 (diff)
downloadandroid_packages_apps_Snap-26d9ea2ff654dfe0f327125d7ef8dda7d96fd5c9.zip
android_packages_apps_Snap-26d9ea2ff654dfe0f327125d7ef8dda7d96fd5c9.tar.gz
android_packages_apps_Snap-26d9ea2ff654dfe0f327125d7ef8dda7d96fd5c9.tar.bz2
SnapdragonCamera: Fix menu highlight issue when rotating device
Fix menu highlight issue when rotating device by resetting highlight after rotation. Change-Id: Ib2dea3801e04afa69e8d43369213bfc2f166e413 CRs-Fixed: 970646
Diffstat (limited to 'src')
-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);
}