diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-10-09 23:46:20 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-10-10 12:15:47 -0700 |
| commit | 4ec139dc81482ebfef1e62a3987c53bd5880c759 (patch) | |
| tree | 15ba771553d27237f2551067fe668496e22014b2 /src/com | |
| parent | 048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf (diff) | |
| download | android_packages_apps_Snap-4ec139dc81482ebfef1e62a3987c53bd5880c759.tar.gz android_packages_apps_Snap-4ec139dc81482ebfef1e62a3987c53bd5880c759.tar.bz2 android_packages_apps_Snap-4ec139dc81482ebfef1e62a3987c53bd5880c759.zip | |
Hide the status bar and switch into lights-out mode when popup is dimissed.
Bug: 11119286
Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 15 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 282c2fe21..0181fec93 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -419,7 +419,7 @@ public class CameraActivity extends Activity * to lights-out mode. */ - private void setSystemBarsVisibility(boolean visible) { + public void setSystemBarsVisibility(boolean visible) { setSystemBarsVisibility(visible, false); } @@ -432,10 +432,17 @@ 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 { diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 3b4d04dc7..24e9738a8 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -575,6 +575,10 @@ public class PhotoUI implements PieListener, mPopup = null; mMenu.popupDismissed(); showUI(); + + // Switch back into fullscreen/lights-out mode after popup + // is dimissed. + mActivity.setSystemBarsVisibility(false); } }); } diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index d255ed7ee..2a715773f 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -150,6 +150,10 @@ public class VideoUI implements PieRenderer.PieListener, popupDismissed(); showUI(); mVideoMenu.popupDismissed(topLevelOnly); + + // Switch back into fullscreen/lights-out mode after popup + // is dimissed. + mActivity.setSystemBarsVisibility(false); } @Override |