summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-09-10 15:08:30 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-09-10 15:08:30 -0700
commit465c11e451e18b7f3e8109fdbbc56b866f7f8a56 (patch)
tree2fe04da31ab3b38c5faa096e526367cdcdbc2308 /src
parent7836330d3734dbab76a31dfc1de596f7481b7139 (diff)
parent5aceecee265f56751fd64436e57d8810e87ec5ff (diff)
downloadandroid_packages_apps_Snap-465c11e451e18b7f3e8109fdbbc56b866f7f8a56.tar.gz
android_packages_apps_Snap-465c11e451e18b7f3e8109fdbbc56b866f7f8a56.tar.bz2
android_packages_apps_Snap-465c11e451e18b7f3e8109fdbbc56b866f7f8a56.zip
Merge "SnapdragonCamera: Reset navigation bar state whenever screen turns on"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 0bd45cdcd..69a1182b0 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1657,6 +1657,13 @@ public class CameraActivity extends Activity
}
@Override
+ public void onWindowFocusChanged(boolean focus) {
+ // Hide action bar first since we are in full screen mode first, and
+ // switch the system UI to lights-out mode.
+ if (focus) this.setSystemBarsVisibility(false);
+ }
+
+ @Override
public void onResume() {
if (mShutterVol >= 0 && mShutterVol <= 100)
mAudioManager.setMasterVolume(mShutterVol,0);