diff options
| author | Paul Rohde <codelogic@google.com> | 2014-12-05 12:17:15 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:44 +0200 |
| commit | a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092 (patch) | |
| tree | d807835b35152ff8116abf6bfbb0e1c34ad3074e /src/com/android/camera/PhotoMenu.java | |
| parent | e29d34af65c92b85f43ec114fa8d13391bffabab (diff) | |
| download | android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.tar.gz android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.tar.bz2 android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.zip | |
Drop new focus indicator into Camera2.
* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.
Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 2ea1263b7..46592b3a8 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -196,7 +196,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_SHUTTER_SPEED, CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_SELFIE_MIRROR, - CameraSettings.KEY_SHUTTER_SOUND + CameraSettings.KEY_SHUTTER_SOUND, CameraSettings.KEY_POWER_SHUTTER, CameraSettings.KEY_MAX_BRIGHTNESS }; @@ -1259,7 +1259,7 @@ public class PhotoMenu extends MenuController } public void openFirstLevel() { - if (isMenuBeingShown() || CameraControls.isAnimating()) { + if (isMenuBeingShown() || mUI.isCameraControlsAnimating()) { return; } if(TsMakeupManager.HAS_TS_MAKEUP) { |