diff options
| author | Doris Liu <tianliu@google.com> | 2013-04-16 16:14:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 16:14:16 -0700 |
| commit | 05f2332b281acd38d31a76cd1e6d47e2fdb4dbd4 (patch) | |
| tree | 9d0cb4d1fd145a4c9095451ab5d1a56c17ce34af /src/com/android/gallery3d | |
| parent | 99e7aede311f9a3a7690463b0b3bbfa01ec7cb7c (diff) | |
| parent | 953f109b688477b086281fe09074d3886ef87fba (diff) | |
| download | android_packages_apps_Gallery2-05f2332b281acd38d31a76cd1e6d47e2fdb4dbd4.tar.gz android_packages_apps_Gallery2-05f2332b281acd38d31a76cd1e6d47e2fdb4dbd4.tar.bz2 android_packages_apps_Gallery2-05f2332b281acd38d31a76cd1e6d47e2fdb4dbd4.zip | |
am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure
Diffstat (limited to 'src/com/android/gallery3d')
| -rw-r--r-- | src/com/android/gallery3d/app/SlideshowPage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index 54aae67ab..d269e90ea 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -113,10 +113,10 @@ public class SlideshowPage extends ActivityState { 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 | FLAG_SHOW_WHEN_LOCKED); + | FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); if (data.getBoolean(KEY_DREAM)) { // Dream screensaver only keeps screen on for plugged devices. - mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED; + mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED | FLAG_SHOW_WHEN_LOCKED; } else { // User-initiated slideshow would always keep screen on. mFlags |= FLAG_SCREEN_ON_ALWAYS; |