Use ALLOW_LOCK_WHILE_SCREEN_ON window manager flag to allow lockscreen to activate...

Change-Id: I302d65c51cd5b6bd495b24479a9c377e4bedf66d
Signed-off-by: Mike Lockwood <lockwood@android.com>

diff --git a/src/com/android/deskclock/AlarmAlertFullScreen.java b/src/com/android/deskclock/AlarmAlertFullScreen.java
index 0173a12..89b82ca 100644 (file)
--- a/src/com/android/deskclock/AlarmAlertFullScreen.java
+++ b/src/com/android/deskclock/AlarmAlertFullScreen.java
@@ -88,7 +88,8 @@ public class AlarmAlertFullScreen extends Activity {
         // subclass.
         if (!getIntent().getBooleanExtra(SCREEN_OFF, false)) {
             win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON);
         }
 
         updateLayout();

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 74d55f5..921c03a 100644 (file)
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -264,9 +264,10 @@ public class DeskClock extends Activity {
         if (DEBUG) Log.d(LOG_TAG, (hold ? "hold" : " releas") + "ing wake lock");
         Window win = getWindow();
         WindowManager.LayoutParams winParams = win.getAttributes();
-        winParams.flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
-        winParams.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
-        winParams.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
+        winParams.flags |= (WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
         if (hold)
             winParams.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
         else