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

Merge "Fix unlock failure when app is in reverse portrait orientation." into sc-v2-dev

Browse Source
This commit is contained in:
Issei Suzuki
2021-10-05 13:17:26 +00:00
committed by Android (Google) Code Review
parent c8730d3600 0f3abd3603
commit b9ee2b5eca
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1816,7 +1816,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
@Override @Override
public int onAppTransitionStartingLocked(boolean keyguardGoingAway, long duration, public int onAppTransitionStartingLocked(boolean keyguardGoingAway, long duration,
long statusBarAnimationStartTime, long statusBarAnimationDuration) { long statusBarAnimationStartTime, long statusBarAnimationDuration) {
return handleStartTransitionForKeyguardLw(keyguardGoingAway, duration); // When remote animation is enabled for KEYGUARD_GOING_AWAY transition, SysUI
// receives IRemoteAnimationRunner#onAnimationStart to start animation, so we don't
// need to call IKeyguardService#keyguardGoingAway here.
return handleStartTransitionForKeyguardLw(keyguardGoingAway
&& !WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation, duration);
} }
@Override @Override
@@ -3064,7 +3068,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) { private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) {
final int res = applyKeyguardOcclusionChange(); final int res = applyKeyguardOcclusionChange();
if (res != 0) return res; if (res != 0) return res;
if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation && keyguardGoingAway) { if (keyguardGoingAway) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation"); if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");
startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration); startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration);
} }

3
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
View File

@@ -410,8 +410,7 @@ public class KeyguardServiceDelegate {
} }
public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) { public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation if (mKeyguardService != null) {
&& mKeyguardService != null) {
mKeyguardService.startKeyguardExitAnimation(startTime, fadeoutDuration); mKeyguardService.startKeyguardExitAnimation(startTime, fadeoutDuration);
} }
} }

9
services/core/java/com/android/server/wm/Transition.java
View File

@@ -758,8 +758,13 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
(flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0, (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0,
(flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0, (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0,
(flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION) != 0); (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION) != 0);
mController.mAtm.mWindowManager.mPolicy.startKeyguardExitAnimation( if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation) {
SystemClock.uptimeMillis(), 0 /* duration */); // When remote animation is enabled for KEYGUARD_GOING_AWAY transition, SysUI
// receives IRemoteAnimationRunner#onAnimationStart to start animation, so we don't
// need to call IKeyguardService#keyguardGoingAway here.
mController.mAtm.mWindowManager.mPolicy.startKeyguardExitAnimation(
SystemClock.uptimeMillis(), 0 /* duration */);
}
} }
if ((flags & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) { if ((flags & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) {
mController.mAtm.mWindowManager.mPolicy.applyKeyguardOcclusionChange(); mController.mAtm.mWindowManager.mPolicy.applyKeyguardOcclusionChange();