summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorAlok Kediya <kediya@codeaurora.org>2013-10-02 17:42:36 +0530
committerLinux Build Service Account <lnxbuild@localhost>2013-10-31 19:39:12 -0600
commit23f3cf5304a0c97ef00f778b543cc754100e34ea (patch)
tree8eb34ca43508027518af13bc4dfbc4d6da7c7a78 /src/com/android/camera/VideoUI.java
parent1dd268e423678952508b042612407c88b9adf991 (diff)
downloadandroid_packages_apps_Snap-23f3cf5304a0c97ef00f778b543cc754100e34ea.tar.gz
android_packages_apps_Snap-23f3cf5304a0c97ef00f778b543cc754100e34ea.tar.bz2
android_packages_apps_Snap-23f3cf5304a0c97ef00f778b543cc754100e34ea.zip
Camera: Menu & zoom options are overlapping in front camera.
When user presses the menuoptions the popup is displayed and UI will have the controll over it, again when zoom is triggered the zoom renderer was not hiding the menu popup. This change will synchronise both listeners mentioned above. (cherrypicked from commit 713847197c35409f0f198903f6b3dd3c39296848 ) Change-Id: Ic4509fe4473070c73dba377c5fdc3f224af71ee0 (cherry picked from commit 6c464f1402110b1f0f9790d5a9479dc3031d04eb) (cherry picked from commit 4fe74b8ad31a6d43c179e0181813ba3bf4c58feb) (cherry picked from commit e525f04730668369f76afb41870199eaad0b9375)
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r--src/com/android/camera/VideoUI.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 23d08dbb4..be325c459 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -697,10 +697,17 @@ public class VideoUI implements PieRenderer.PieListener,
@Override
public void onZoomStart() {
+ if (mPieRenderer != null) {
+ mPieRenderer.hide();
+ mPieRenderer.setBlockFocus(true);
+ }
}
@Override
public void onZoomEnd() {
+ if (mPieRenderer != null) {
+ mPieRenderer.setBlockFocus(false);
+ }
}
}