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

Merge "Revert to O home button behaviour for over lockscreen activities" into pi-dev

Browse Source
This commit is contained in:
Winson Chung
2018-07-27 20:44:17 +00:00
committed by Android (Google) Code Review
parent 5ad001eb4f 8fec01a141
commit e8b7b30672
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -4397,17 +4397,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (isKeyguardShowingAndNotOccluded()) { if (isKeyguardShowingAndNotOccluded()) {
// don't launch home if keyguard showing // don't launch home if keyguard showing
return; return;
} else if (mKeyguardOccluded && mKeyguardDelegate.isShowing()) { }
mKeyguardDelegate.dismiss(new KeyguardDismissCallback() {
@Override if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {
public void onDismissSucceeded() throws RemoteException {
mHandler.post(() -> {
startDockOrHome(true /*fromHomeKey*/, awakenFromDreams);
});
}
}, null /* message */);
return;
} else if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {
// when in keyguard restricted mode, must first verify unlock // when in keyguard restricted mode, must first verify unlock
// before launching home // before launching home
mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() { mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {