diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-05-28 17:14:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-28 17:14:18 +0000 |
| commit | 2cca828ec5186105723ae85e618bfca0bb59cdb8 (patch) | |
| tree | 428de068679771ccaeb681e94fb1e8f6a98b09e6 /src/com | |
| parent | d6145d21419680b22a6daa6da95ee566bef72df6 (diff) | |
| parent | 37eb0e35b34f492e212b373bdd2e0b071e307df0 (diff) | |
| download | android_packages_apps_Snap-2cca828ec5186105723ae85e618bfca0bb59cdb8.tar.gz android_packages_apps_Snap-2cca828ec5186105723ae85e618bfca0bb59cdb8.tar.bz2 android_packages_apps_Snap-2cca828ec5186105723ae85e618bfca0bb59cdb8.zip | |
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
| -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; |