From: Bobby Georgescu <georgescu@google.com>
Date: Fri, 24 May 2013 22:58:32 +0000 (-0700)
Subject: Prevent lock screen appearing during active slideshow
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~8^2^2~8^2~8^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef132358deba6acbbeaf0a63014c77c98bca1d9a;p=android-x86%2Fpackages-apps-Camera2.git

Prevent lock screen appearing during active slideshow

Bug: 9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234
---

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;