commit c1aaf4b526507245428ef56a03727a5d0fb68659
author Bobby Georgescu <georgescu@google.com> Tue May 28 10:15:02 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 28 10:15:02 2013 -0700
tree b2d0c18c45d984eff256339e72ac9c92f624caba
parent c4edd18dcd6fa025a059b45e2f4c827569a24ac5
parent e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e

am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow

src/com/android/gallery3d/app/SlideshowPage.java

diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index d269e90..174058d 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -112,8 +112,7 @@
     @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;