diff options
| author | Yuli Huang <yuli@google.com> | 2012-05-28 23:39:27 +0800 |
|---|---|---|
| committer | Yuli Huang <yuli@google.com> | 2012-05-29 15:02:05 +0800 |
| commit | afb3d1d8f341620f6b69d47d52b515f53817aa91 (patch) | |
| tree | 2be4c7b3c5037a72415a28e7919dcfa850192b5b /src/com/android/gallery3d/app/SlideshowPage.java | |
| parent | 00bb8e439e33848d679a4404c203af9ed1a06a19 (diff) | |
| download | android_packages_apps_Gallery2-afb3d1d8f341620f6b69d47d52b515f53817aa91.tar.gz android_packages_apps_Gallery2-afb3d1d8f341620f6b69d47d52b515f53817aa91.tar.bz2 android_packages_apps_Gallery2-afb3d1d8f341620f6b69d47d52b515f53817aa91.zip | |
Keep screen on for user-initiated slideshow.
Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f
b:6450305
Diffstat (limited to 'src/com/android/gallery3d/app/SlideshowPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/SlideshowPage.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index 5aa3985b2..a6ae52725 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -48,6 +48,7 @@ public class SlideshowPage extends ActivityState { public static final String KEY_PHOTO_INDEX = "photo-index"; public static final String KEY_RANDOM_ORDER = "random-order"; public static final String KEY_REPEAT = "repeat"; + public static final String KEY_DREAM = "dream"; private static final long SLIDESHOW_DELAY = 3000; // 3 seconds @@ -104,7 +105,14 @@ public class SlideshowPage extends ActivityState { @Override public void onCreate(Bundle data, Bundle restoreState) { - mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR | FLAG_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; + } else { + // User-initiated slideshow would always keep screen on. + mFlags |= FLAG_SCREEN_ON_ALWAYS; + } mHandler = new SynchronizedHandler(mActivity.getGLRoot()) { @Override |