diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-17 21:56:40 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-17 21:56:40 -0700 |
commit | 05a924f0b9d322d0c7664926a5720fbc30da9afd (patch) | |
tree | 933e1b6999813f99be0d1f2b67d850964907e2c9 /src/com/android/camera/PhotoModule.java | |
parent | fb652c3dcee58e684d9e7e7f4ed7d34d0a7c0d16 (diff) | |
parent | 3d7f401c05b32a2689ab564ab4e05010b72ea5b7 (diff) | |
download | android_packages_apps_Snap-05a924f0b9d322d0c7664926a5720fbc30da9afd.tar.gz android_packages_apps_Snap-05a924f0b9d322d0c7664926a5720fbc30da9afd.tar.bz2 android_packages_apps_Snap-05a924f0b9d322d0c7664926a5720fbc30da9afd.zip |
Merge changes I2139274e,I1d18d936 into camera.lnx.1.0-dev.1.0
* changes:
SnapdragonCamera: Fix occasional touch AF/AEC detection failure.
SnapdragonCamera: Hide remaining photo counter
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index e10d33b93..0cea85f99 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2566,12 +2566,6 @@ public class PhotoModule // we will update focus manager with proper UI. if (mFocusManager != null && mUI != null) { mFocusManager.setPhotoUI(mUI); - - View root = mUI.getRootView(); - // These depend on camera parameters. - int width = root.getWidth(); - int height = root.getHeight(); - mFocusManager.setPreviewSize(width, height); } } |