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

Prevent KeyguardPresentation been dismissed.

Browse Source 
By default Presentation can be dismiss if DisplayMetrics has changed.
However, even when DisplayMetrics has changed, we should still show
KeyguardPresentation on secondary display.

Bug: 149004025
Test: follow issue description.
Test: atest MultiDisplayKeyguardTests
Change-Id: Icf7f5726648bc8b8037bbdd31eac3f0b1cbd5945
This commit is contained in:
wilsonshih
2020-02-14 11:20:51 +08:00
parent 8a48bc0b1f
commit c21e6de908
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
View File

@@ -72,11 +72,12 @@ public class KeyguardDisplayManager {
@Override
public void onDisplayChanged(int displayId) {
if (displayId == DEFAULT_DISPLAY) return;
final Display display = mDisplayService.getDisplay(displayId);
if (display != null && mShowing) {
final Presentation presentation = mPresentations.get(displayId);
if (presentation != null && !presentation.getDisplay().equals(display)) {
hidePresentation(displayId);
final Presentation presentation = mPresentations.get(displayId);
if (presentation != null && mShowing) {
hidePresentation(displayId);
// update DisplayInfo.
final Display display = mDisplayService.getDisplay(displayId);
if (display != null) {
showPresentation(display);
}
}
@@ -265,6 +266,11 @@ public class KeyguardDisplayManager {
setCancelable(false);
}
@Override
public void cancel() {
// Do not allow anything to cancel KeyguardPresetation except KeyguardDisplayManager.
}
@Override
public void onDetachedFromWindow() {
mClock.removeCallbacks(mMoveTextRunnable);