diff options
| author | Doris Liu <tianliu@google.com> | 2013-04-16 23:12:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 23:12:49 +0000 |
| commit | cc41601e7344f948452013b4751b8b541c6f7432 (patch) | |
| tree | ebb56be10b19bc8ec2e14695de57807fcd7eea52 /src | |
| parent | 2eb339731638b67b0be4a180fd1eb7d6c81fde5e (diff) | |
| parent | 80c042e197bc710424add30d75c35c58a16b1e8f (diff) | |
| download | android_packages_apps_Snap-cc41601e7344f948452013b4751b8b541c6f7432.tar.gz android_packages_apps_Snap-cc41601e7344f948452013b4751b8b541c6f7432.tar.bz2 android_packages_apps_Snap-cc41601e7344f948452013b4751b8b541c6f7432.zip | |
Merge "Fix face unlock failure" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -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; |