summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-09-11 18:02:38 -0700
committerCraig Mautner <cmautner@google.com>2014-09-11 18:02:38 -0700
commit7d7808fcf8e6a1c27d52375210f9da2705d5f590 (patch)
treeb05fbfde49a276fbfa37b0ae111c141180d26af0 /policy
parentc13fcace7e7cef6b20e9d20f05372fdf99cee843 (diff)
downloadframeworks_base-7d7808fcf8e6a1c27d52375210f9da2705d5f590.zip
frameworks_base-7d7808fcf8e6a1c27d52375210f9da2705d5f590.tar.gz
frameworks_base-7d7808fcf8e6a1c27d52375210f9da2705d5f590.tar.bz2
Show all windows from activity that hides keyguard
Popup windows from the activity hiding the keyguard weren't being shown. This change retrieves that activity from PhoneWindowManager and applies the show or hide call to the windows that match the activity. Fixes bug 16479813. Change-Id: Ia6fe97240aec85c5233eee9038138f7d48095a6e
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ca43633..8b8124d 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1759,6 +1759,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
+ @Override
+ public WindowState getWinShowWhenLockedLw() {
+ return mWinShowWhenLocked;
+ }
+
/** {@inheritDoc} */
@Override
public View addStartingWindow(IBinder appToken, String packageName, int theme,
@@ -3795,7 +3800,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mShowingLockscreen = true;
}
boolean appWindow = attrs.type >= FIRST_APPLICATION_WINDOW
- && attrs.type <= LAST_APPLICATION_WINDOW;
+ && attrs.type < FIRST_SYSTEM_WINDOW;
if (attrs.type == TYPE_DREAM) {
// If the lockscreen was showing when the dream started then wait
// for the dream to draw before hiding the lockscreen.