From 0156d9179bb9ba8718b25ee05985a7c71e5578c7 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Mon, 30 Sep 2013 15:52:28 -0700
Subject: Show status bar in filmstrip mode

  Bug: 11005642

Also makes sure we only call setSystemUiVisibility in only one
place.

Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
---
 res/values/styles.xml                         | 2 +-
 src/com/android/camera/CameraActivity.java    | 2 +-
 src/com/android/camera/ui/CameraRootView.java | 2 --
 src/com/android/camera/ui/FilmStripView.java  | 5 -----
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0d6241588..96e032b68 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
     </style>
 
     <style name="Theme.Camera" parent="Theme.CameraBase">
-        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowFullscreen">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowTitleSize">0dp</item>
         <item name="android:windowActionBarOverlay">true</item>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 21be8e740..e8e34327a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -432,7 +432,7 @@ public class CameraActivity extends Activity
 
         if (visible != currentlyVisible) {
             int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (visible ? View.SYSTEM_UI_FLAG_VISIBLE
-                    : View.SYSTEM_UI_FLAG_LOW_PROFILE);
+                    : View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN);
             mAboveFilmstripControlLayout.setSystemUiVisibility(visibility);
             if (visible) {
                 mActionBar.show();
diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java
index 83f2dd8f4..1e4708ec7 100644
--- a/src/com/android/camera/ui/CameraRootView.java
+++ b/src/com/android/camera/ui/CameraRootView.java
@@ -49,8 +49,6 @@ public class CameraRootView extends FrameLayout {
     public CameraRootView(Context context, AttributeSet attrs) {
         super(context, attrs);
         initDisplayListener();
-        setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
 
     @Override
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index f28637c9d..955b904bf 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -636,11 +636,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
     }
 
     private void init(CameraActivity cameraActivity) {
-        // This is for positioning camera controller at the same place in
-        // different orientations.
-        setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-
         setWillNotDraw(false);
         mActivity = cameraActivity;
         mScale = 1.0f;
-- 
cgit v1.2.3