diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-12 00:12:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-12 00:12:11 +0000 |
| commit | 87d093d6145524b1c8f5c052dfe40c18b52e5235 (patch) | |
| tree | 26f81cfa23e31d41c3d6728549a929a01599d633 | |
| parent | 3772d2f48ee5af8516f203f0f0519a2075042d6b (diff) | |
| parent | 97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc (diff) | |
| download | android_packages_apps_Snap-87d093d6145524b1c8f5c052dfe40c18b52e5235.tar.gz android_packages_apps_Snap-87d093d6145524b1c8f5c052dfe40c18b52e5235.tar.bz2 android_packages_apps_Snap-87d093d6145524b1c8f5c052dfe40c18b52e5235.zip | |
Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 96e032b68..0d6241588 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">false</item> + <item name="android:windowFullscreen">true</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 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 { |