summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-03-10 16:43:18 -0800
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:46 -0700
commit038809e1d3f444e65e9de9f5f4b46bd442862d79 (patch)
tree50d42d761a0fd464c5634c0a6f123a39dc33f592 /src
parentb2b382bf30ed6438a1eac9b00261659ad588eaa3 (diff)
downloadandroid_packages_apps_Snap-038809e1d3f444e65e9de9f5f4b46bd442862d79.zip
android_packages_apps_Snap-038809e1d3f444e65e9de9f5f4b46bd442862d79.tar.gz
android_packages_apps_Snap-038809e1d3f444e65e9de9f5f4b46bd442862d79.tar.bz2
SnapdragonCamera: Reset menu when device is rotated
Reset the settings menu when the device is rotated Change-Id: I6c4fed7207a4d26a9d7c29d18f6a7af17ef3d4f9 CRs-Fixed: 981504
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java1
-rw-r--r--src/com/android/camera/PhotoUI.java8
-rw-r--r--src/com/android/camera/VideoModule.java1
-rw-r--r--src/com/android/camera/VideoUI.java9
4 files changed, 14 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 65e2f14..6702df3 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 970e2e5..c3bdfa6 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 231d9ab..70dace0 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 5245187..375e89b 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;
}