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 | 26eb4ed5239f59de7a7e212a03047f3e0afa3c74 (patch) | |
| tree | 74b629181b74d895df7b3c1b296d9038497b762e /src/com/android/gallery3d/app/ActivityState.java | |
| parent | b603e674b9e0bc7372fd535f7f3ac0b9b4e3a689 (diff) | |
| download | android_packages_apps_Snap-26eb4ed5239f59de7a7e212a03047f3e0afa3c74.tar.gz android_packages_apps_Snap-26eb4ed5239f59de7a7e212a03047f3e0afa3c74.tar.bz2 android_packages_apps_Snap-26eb4ed5239f59de7a7e212a03047f3e0afa3c74.zip | |
Keep screen on for user-initiated slideshow.
Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f
b:6450305
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
| -rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 66b4a2279..867cda3e5 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -36,7 +36,8 @@ import com.android.gallery3d.ui.GLView; abstract public class ActivityState { protected static final int FLAG_HIDE_ACTION_BAR = 1; protected static final int FLAG_HIDE_STATUS_BAR = 2; - protected static final int FLAG_SCREEN_ON = 4; + protected static final int FLAG_SCREEN_ON_WHEN_PLUGGED = 4; + protected static final int FLAG_SCREEN_ON_ALWAYS = 8; private static final int SCREEN_ON_FLAGS = ( WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON @@ -117,7 +118,8 @@ abstract public class ActivityState { void setScreenOnFlags() { final Window win = ((Activity) mActivity).getWindow(); final WindowManager.LayoutParams params = win.getAttributes(); - if (mPlugged && 0 != (mFlags & FLAG_SCREEN_ON)) { + if ((0 != (mFlags & FLAG_SCREEN_ON_ALWAYS)) || + (mPlugged && 0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED))) { params.flags |= SCREEN_ON_FLAGS; } else { params.flags &= ~SCREEN_ON_FLAGS; @@ -126,7 +128,7 @@ abstract public class ActivityState { } protected void onPause() { - if (0 != (mFlags & FLAG_SCREEN_ON)) { + if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) { ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver); } } @@ -160,7 +162,7 @@ abstract public class ActivityState { onStateResult(entry.requestCode, entry.resultCode, entry.resultData); } - if (0 != (mFlags & FLAG_SCREEN_ON)) { + if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) { // we need to know whether the device is plugged in to do this correctly final IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_BATTERY_CHANGED); |