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

am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev

Browse Source 
* commit 'ec799e883cb309fc12f22cab19e53f1e27886ba5':
  More on #7296510 Transition from lock screen to dreaming is really bad
This commit is contained in:
Dianne Hackborn
2012-10-07 23:35:47 -07:00
committed by Android Git Automerger
parent f0b8e3adc4 ec799e883c
commit e71a630fc6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2925,14 +2925,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mNoDreamEnterAnim = true;
}
if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)
|| attrs.type == TYPE_DREAM)
|| (attrs.type == TYPE_DREAM && win.isVisibleLw()))
&& attrs.x == 0 && attrs.y == 0
&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT
&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);
mTopFullscreenOpaqueWindowState = win;
if (attrs.type == TYPE_DREAM) {
mNoDreamEnterAnim = true;
mForceStatusBarFromKeyguard = true;
}
if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);