From 05144ea1efd569a46e02f7b729150b7ca80b695f Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Thu, 7 Aug 2014 18:02:07 -0700
Subject: Route zoom value through to zoomIndex in device API

Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.

Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.

Bug: 16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
---
 src/com/android/camera/PhotoModule.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c39766b8e..75de51621 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2289,7 +2289,7 @@ public class PhotoModule
                 mCameraCapabilities.supports(CameraCapabilities.FocusMode.CONTINUOUS_PICTURE);
     }
 
-    // TODO: Remove this
+    // TODO: Use zoomRatio device API rather than deprecated zoomIndex
     @Override
     public int onZoomChanged(int index) {
         // Not useful to change zoom value when the activity is paused.
@@ -2301,7 +2301,7 @@ public class PhotoModule
             return index;
         }
         // Set zoom parameters asynchronously
-        mCameraSettings.setZoomRatio(mZoomValue);
+        mCameraSettings.setZoomIndex(mZoomValue);
         mCameraDevice.applySettings(mCameraSettings);
         CameraSettings settings = mCameraDevice.getSettings();
         if (settings != null) {
-- 
cgit v1.2.3


From 7870958ca8cbd87470a374b6f49c3c21f26b659a Mon Sep 17 00:00:00 2001
From: Spike Sprague <spikuru@google.com>
Date: Thu, 7 Aug 2014 14:56:27 -0700
Subject: rollback of b/16632474 and ag/518674

Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
---
 AndroidManifest.xml                        | 2 +-
 src/com/android/camera/CameraActivity.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 28ea1c223..284b361dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="L" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e49ad4671..5d02672ea 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -258,7 +258,6 @@ public class CameraActivity extends Activity
     private static final int LIGHTS_OUT_DELAY_MS = 4000;
     private final int BASE_SYS_UI_VISIBILITY =
         View.SYSTEM_UI_FLAG_FULLSCREEN
-        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
         | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
     private final Runnable mLightsOutRunnable = new Runnable() {
         @Override
-- 
cgit v1.2.3