diff options
| author | ztenghui <ztenghui@google.com> | 2013-11-07 17:53:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-07 17:53:54 +0000 |
| commit | 9070def99369ccdffb1cf5e006ed30646297f490 (patch) | |
| tree | 7be17e843576a1dc87186979ab3fb160c5219d30 | |
| parent | eb605b4a27be212915db5bc23e9a82b857036a1c (diff) | |
| parent | 17f1e65142df55ebccfa30720cd1265f9ab67e96 (diff) | |
| download | android_packages_apps_Snap-9070def99369ccdffb1cf5e006ed30646297f490.tar.gz android_packages_apps_Snap-9070def99369ccdffb1cf5e006ed30646297f490.tar.bz2 android_packages_apps_Snap-9070def99369ccdffb1cf5e006ed30646297f490.zip | |
Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a8c4bd850..e1d2a924f 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -339,6 +339,7 @@ public class CameraActivity extends Activity @Override public void onReload() { setPreviewControlsVisibility(true); + CameraActivity.this.setSystemBarsVisibility(false); } @Override @@ -466,13 +467,17 @@ public class CameraActivity extends Activity */ private void setSystemBarsVisibility(boolean visible, boolean hideLater) { mMainHandler.removeMessages(HIDE_ACTION_BAR); - boolean currentlyVisible = mActionBar.isShowing(); - 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); + int currentSystemUIVisibility = mAboveFilmstripControlLayout.getSystemUiVisibility(); + int newSystemUIVisibility = DEFAULT_SYSTEM_UI_VISIBILITY | + (visible ? View.SYSTEM_UI_FLAG_VISIBLE : + View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN); + if (newSystemUIVisibility != currentSystemUIVisibility) { + mAboveFilmstripControlLayout.setSystemUiVisibility(newSystemUIVisibility); + } + boolean currentActionBarVisibility = mActionBar.isShowing(); + if (visible != currentActionBarVisibility) { if (visible) { mActionBar.show(); } else { |