summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-09-29 14:42:47 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-09-29 14:42:47 -0700
commitaca743cbd3979f1d24cc5740a6e430b88c00923a (patch)
tree5dde0b8f47b56ba5742d78f4b4bd9cc02571627e /src/com/android/camera/CameraActivity.java
parent5fa760053dcae8e0ebd4cfea45d43e9cb5e6a7ce (diff)
parent5bdb35284a6cdb5b406aa9382e0d3161cbb14f67 (diff)
downloadandroid_packages_apps_Snap-aca743cbd3979f1d24cc5740a6e430b88c00923a.tar.gz
android_packages_apps_Snap-aca743cbd3979f1d24cc5740a6e430b88c00923a.tar.bz2
android_packages_apps_Snap-aca743cbd3979f1d24cc5740a6e430b88c00923a.zip
Merge "SnapdragonCamera:Fix icons overlapped with navigation bar"
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 012446ac4..09476afc3 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1510,9 +1510,6 @@ public class CameraActivity extends Activity
mAboveFilmstripControlLayout =
(FrameLayout) findViewById(R.id.camera_above_filmstrip_layout);
mAboveFilmstripControlLayout.setFitsSystemWindows(true);
- // Hide action bar first since we are in full screen mode first, and
- // switch the system UI to lights-out mode.
- this.setSystemBarsVisibility(false);
mPanoramaManager = AppManagerFactory.getInstance(this)
.getPanoramaStitchingManager();
mPlaceholderManager = AppManagerFactory.getInstance(this)
@@ -1674,6 +1671,9 @@ public class CameraActivity extends Activity
@Override
public void onResume() {
+ // Hide action bar first since we are in full screen mode first, and
+ // switch the system UI to lights-out mode.
+ this.setSystemBarsVisibility(false);
if (mShutterVol >= 0 && mShutterVol <= 100)
mAudioManager.setMasterVolume(mShutterVol,0);