diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-05-28 10:17:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 10:17:48 -0700 |
| commit | c4ef64c8cc8ba7edc543f64efcb25c401cc94466 (patch) | |
| tree | 4ff0af59bbec9d739d5a13f36d35e1ab24bd1b9a /src | |
| parent | f6f4abec09afda4d802ac0b7b2006d86a6161892 (diff) | |
| parent | c1aaf4b526507245428ef56a03727a5d0fb68659 (diff) | |
| download | android_packages_apps_Gallery2-c4ef64c8cc8ba7edc543f64efcb25c401cc94466.tar.gz android_packages_apps_Gallery2-c4ef64c8cc8ba7edc543f64efcb25c401cc94466.tar.bz2 android_packages_apps_Gallery2-c4ef64c8cc8ba7edc543f64efcb25c401cc94466.zip | |
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit 'c1aaf4b526507245428ef56a03727a5d0fb68659':
Prevent lock screen appearing during active slideshow
Diffstat (limited to 'src')
| -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; |