summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-10-11 16:54:51 -0700
committerDoris Liu <tianliu@google.com>2013-10-11 16:54:51 -0700
commit97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc (patch)
treedde61c346002eb88d77ad25ffd9620a30840160b /src
parentf06221914bf40b6345cacd1a5904d773c6eddcb0 (diff)
downloadandroid_packages_apps_Snap-97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc.tar.gz
android_packages_apps_Snap-97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc.tar.bz2
android_packages_apps_Snap-97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc.zip
Bring full screen window flag back to camera
Bug: 11027091 Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 6fce2ffb8..132e5ceba 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -418,7 +418,7 @@ public class CameraActivity extends Activity
* If {@param visible} is false, this hides the action bar and switches the system UI
* to lights-out mode.
*/
-
+ // TODO: This should not be called outside of the activity.
public void setSystemBarsVisibility(boolean visible) {
setSystemBarsVisibility(visible, false);
}
@@ -432,17 +432,11 @@ public class CameraActivity extends Activity
mMainHandler.removeMessages(HIDE_ACTION_BAR);
boolean currentlyVisible = mActionBar.isShowing();
- // We need to set these flags independently of the action bar
- // visibility, as the system can change the system UI visibility
- // independently.
- // Note: setSystemUiVisibitliy will be a no-op if the flag passed in is
- // the same as the current one, so it's OK to call this often. Adding an
- // additional check here is therefore unnecessary.
- int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (visible ? View.SYSTEM_UI_FLAG_VISIBLE
- : View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN);
- mAboveFilmstripControlLayout.setSystemUiVisibility(visibility);
-
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_FULLSCREEN);
+ mAboveFilmstripControlLayout.setSystemUiVisibility(visibility);
+
if (visible) {
mActionBar.show();
} else {