Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f7178d3c: Allow the secure keyguard to engage behind Dreams.

Browse Source 
* commit 'f7178d3cadfeb0101491eeea7d7f3b0d7c26dbe6':
  Allow the secure keyguard to engage behind Dreams.
This commit is contained in:
Daniel Sandler
2012-08-11 07:44:13 -07:00
committed by Android Git Automerger
parent e80693f6fc f7178d3cad
commit 52d5ab27f1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/dreams/Dream.java
View File

@@ -346,6 +346,11 @@ public class Dream extends Service implements Window.Callback {
lp.type = WindowManager.LayoutParams.TYPE_DREAM;
lp.token = windowToken;
lp.windowAnimations = com.android.internal.R.style.Animation_Dream;
lp.flags |= ( WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
| WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
| WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
);
mWindow.setAttributes(lp);
//WindowManagerImpl.getDefault().addView(mWindow.getDecorView(), lp);

4
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -2854,8 +2854,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
mForceStatusBar = true;
}
if (attrs.type >= FIRST_APPLICATION_WINDOW
&& attrs.type <= LAST_APPLICATION_WINDOW
if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)
|| attrs.type == TYPE_DREAM)
&& attrs.x == 0 && attrs.y == 0
&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT
&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {