diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-06 11:55:35 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-06 11:55:35 -0700 |
commit | 22610d24c29adac498ffb7308141250f06ffdcfc (patch) | |
tree | 657448944e893f5cc51f746bab0c16b38744929d | |
parent | 5eca5f526f470be011c9e56603fe45df347d623e (diff) | |
parent | 5199c2078f3aea06732015ce8ad354c066a2f4ec (diff) | |
download | android_packages_apps_Snap-22610d24c29adac498ffb7308141250f06ffdcfc.tar.gz android_packages_apps_Snap-22610d24c29adac498ffb7308141250f06ffdcfc.tar.bz2 android_packages_apps_Snap-22610d24c29adac498ffb7308141250f06ffdcfc.zip |
am 5199c207: Set the system UI to low profile when we hide the action bar.
* commit '5199c2078f3aea06732015ce8ad354c066a2f4ec':
Set the system UI to low profile when we hide the action bar.
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index caaa0244d..f82477c68 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -143,6 +143,9 @@ public class CameraActivity extends Activity private ShareActionProvider mPanoramaShareActionProvider; private Intent mPanoramaShareIntent; + private final int DEFAULT_SYSTEM_UI_VISIBILITY = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION; + public void gotoGallery() { mFilmStripView.getController().goToNextItem(); } @@ -223,9 +226,9 @@ public class CameraActivity extends Activity public void onSwitchMode(boolean toCamera) { mCurrentModule.onSwitchMode(toCamera); if (toCamera) { - mActionBar.hide(); + setActionBarVisibilityAndLightsOut(true); } else { - mActionBar.show(); + setActionBarVisibilityAndLightsOut(false); } } @@ -247,7 +250,7 @@ public class CameraActivity extends Activity if (currentData.getLocalDataType() == LocalData.LOCAL_CAMERA_PREVIEW) { // Don't show the action bar in Camera preview. - mActionBar.hide(); + setActionBarVisibilityAndLightsOut(true); } else { updateActionBarMenu(dataID); } @@ -273,18 +276,34 @@ public class CameraActivity extends Activity @Override public boolean onToggleActionBarVisibility() { if (mActionBar.isShowing()) { - mActionBar.hide(); + setActionBarVisibilityAndLightsOut(true); } else { // In the preview, don't show the action bar if that is // a capture intent. if (!isCaptureIntent()) { - mActionBar.show(); + setActionBarVisibilityAndLightsOut(false); } } return mActionBar.isShowing(); } }; + /** + * If enabled, this hides the action bar and switches the system UI to + * lights-out mode. + */ + private void setActionBarVisibilityAndLightsOut(boolean enabled) { + if (enabled) { + mActionBar.hide(); + } else { + mActionBar.show(); + } + int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (enabled ? View.SYSTEM_UI_FLAG_LOW_PROFILE + : View.SYSTEM_UI_FLAG_VISIBLE); + mAboveFilmstripControlLayout + .setSystemUiVisibility(visibility); + } + private void hidePanoStitchingProgress() { mPanoStitchingPanel.setVisibility(View.GONE); } @@ -629,8 +648,6 @@ public class CameraActivity extends Activity getWindow().requestFeature(Window.FEATURE_ACTION_BAR); setContentView(R.layout.camera_filmstrip); mActionBar = getActionBar(); - // Hide action bar first since we are in full screen mode first. - mActionBar.hide(); if (ApiHelper.HAS_ROTATION_ANIMATION) { setRotationAnimation(); @@ -669,9 +686,9 @@ public class CameraActivity extends Activity mAboveFilmstripControlLayout = (FrameLayout) findViewById(R.id.camera_above_filmstrip_layout); mAboveFilmstripControlLayout.setFitsSystemWindows(true); - mAboveFilmstripControlLayout.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); + // Hide action bar first since we are in full screen mode first, and + // switch the system UI to lights-out mode. + setActionBarVisibilityAndLightsOut(true); mPanoramaManager = AppManagerFactory.getInstance(this) .getPanoramaStitchingManager(); mPanoramaManager.addTaskListener(mStitchingListener); |