diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-11 17:13:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 17:13:52 -0700 |
| commit | 3a6c47dddab9f76493cedfadcf2393f006112525 (patch) | |
| tree | 43772ed54bdda268dfe943b5203146a536da94ea | |
| parent | c065ae53b07d9402b1171f12cfba89fd2d2bfb38 (diff) | |
| parent | 87d093d6145524b1c8f5c052dfe40c18b52e5235 (diff) | |
| download | android_packages_apps_Snap-3a6c47dddab9f76493cedfadcf2393f006112525.tar.gz android_packages_apps_Snap-3a6c47dddab9f76493cedfadcf2393f006112525.tar.bz2 android_packages_apps_Snap-3a6c47dddab9f76493cedfadcf2393f006112525.zip | |
am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
* commit '87d093d6145524b1c8f5c052dfe40c18b52e5235':
Bring full screen window flag back to camera
| -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 { |