summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/com/android/camera/CameraActivity.java1
2 files changed, 1 insertions, 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