diff options
author | Bobby Georgescu <georgescu@google.com> | 2013-05-28 10:15:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 10:15:20 -0700 |
commit | f8c7bff9f5b88fb83696e192c3ff343fa810c5b9 (patch) | |
tree | 0de45d07fc5687f2511193394f7106f2fc7ac48a /src/com/android/gallery3d | |
parent | f22d8c2e1f011a31e56db45cab07c98a2a03ad9a (diff) | |
parent | 2cca828ec5186105723ae85e618bfca0bb59cdb8 (diff) | |
download | android_packages_apps_Snap-f8c7bff9f5b88fb83696e192c3ff343fa810c5b9.tar.gz android_packages_apps_Snap-f8c7bff9f5b88fb83696e192c3ff343fa810c5b9.tar.bz2 android_packages_apps_Snap-f8c7bff9f5b88fb83696e192c3ff343fa810c5b9.zip |
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r-- | src/com/android/gallery3d/app/SlideshowPage.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index d269e90ea..174058dc8 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -112,8 +112,7 @@ public class SlideshowPage extends ActivityState { @Override public void onCreate(Bundle data, Bundle restoreState) { super.onCreate(data, restoreState); - mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR - | FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); + mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR); if (data.getBoolean(KEY_DREAM)) { // Dream screensaver only keeps screen on for plugged devices. mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED | FLAG_SHOW_WHEN_LOCKED; |