diff options
| author | Doris Liu <tianliu@google.com> | 2013-04-16 15:54:42 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-04-16 15:54:42 -0700 |
| commit | 80c042e197bc710424add30d75c35c58a16b1e8f (patch) | |
| tree | 1e5534fa7a03b30deddef18281e1a339e9337b2c /src | |
| parent | 6c5f5f43f18b466e7a51b8ebcd133e81029dba67 (diff) | |
| download | android_packages_apps_Snap-80c042e197bc710424add30d75c35c58a16b1e8f.tar.gz android_packages_apps_Snap-80c042e197bc710424add30d75c35c58a16b1e8f.tar.bz2 android_packages_apps_Snap-80c042e197bc710424add30d75c35c58a16b1e8f.zip | |
Fix face unlock failure
Bug: 7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
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; |