SnapdragonCamera: Reset menu when device is rotated

Reset the settings menu when the device is rotated

Change-Id: I6c4fed7207a4d26a9d7c29d18f6a7af17ef3d4f9
CRs-Fixed: 981504

4 files changed, 14 insertions, 5 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 65e2f1496..6702df316 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2041,6 +2041,7 @@ public class PhotoModule
                 setFlipValue();
                 mCameraDevice.setParameters(mParameters);
             }
+            mUI.tryToCloseSubList();
             mUI.setOrientation(mOrientation, true);
         }
 
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 970e2e5c9..c3bdfa6c4 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -159,8 +159,7 @@ public class PhotoUI implements PieListener,
         @Override
         public void onLayoutChange(View v, int left, int top, int right,
                 int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-            if (mMenu != null)
-                mMenu.tryToCloseSubList();
+            tryToCloseSubList();
 
             Camera.Parameters parameters = ((PhotoModule)mController).getParameters();
             if(parameters != null) {
@@ -1256,6 +1255,11 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    public void tryToCloseSubList() {
+        if (mMenu != null)
+            mMenu.tryToCloseSubList();
+    }
+
     public int getOrientation() {
         return mOrientation;
     }
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 231d9abf5..70dace052 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -676,6 +676,7 @@ public class VideoModule implements CameraModule,
                 setFlipValue();
                 mCameraDevice.setParameters(mParameters);
             }
+            mUI.tryToCloseSubList();
             mUI.setOrientation(newOrientation, true);
         }
 
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 5245187ee..375e89b66 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -122,9 +122,7 @@ public class VideoUI implements PieRenderer.PieListener,
         @Override
         public void onLayoutChange(View v, int left, int top, int right,
                 int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-            if(mVideoMenu != null) {
-                mVideoMenu.tryToCloseSubList();
-            }
+            tryToCloseSubList();
         }
     };
 
@@ -1112,6 +1110,11 @@ public class VideoUI implements PieRenderer.PieListener,
         mOrientation = orientation;
     }
 
+    public void tryToCloseSubList() {
+        if (mVideoMenu != null)
+            mVideoMenu.tryToCloseSubList();
+    }
+
     public int getOrientation() {
         return mOrientation;
     }