From 26d9ea2ff654dfe0f327125d7ef8dda7d96fd5c9 Mon Sep 17 00:00:00 2001 From: Byunghun Jeon Date: Wed, 3 Feb 2016 11:22:30 -0800 Subject: 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 --- src/com/android/camera/PhotoMenu.java | 1 + src/com/android/camera/VideoMenu.java | 1 + src/com/android/camera/ui/ListMenu.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index d77d90051..879b3772b 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 a792be2ec..196adbafd 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 80a00a7fb..bb21f7e0a 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); } -- cgit v1.2.3