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

resolved conflicts for merge of f05f7ab1 to master

Browse Source 
Change-Id: Id39b4f1f0aefb387261bbe721050814d5517cea1
This commit is contained in:
Jean-Baptiste Queru
2010-01-28 08:15:50 -08:00
parent 70cdb408cb 85e70956eb
commit 5704f326e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1458,18 +1458,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
} else if (mHideLockScreen) {
if (mKeyguard.hideLw(true)) {
mKeyguardMediator.setHidden(true);
changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
}
mKeyguardMediator.setHidden(true);
} else {
if (mKeyguard.showLw(true)) {
mKeyguardMediator.setHidden(false);
changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
}
mKeyguardMediator.setHidden(false);
}
}