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

Add keyguardGoingAway to the state controller.

Browse Source 
There was previously no method to get callbacks about
goingAway, and it was also inconsistently updated,
which is not ideal for a StateController.

Bug: 229890190
Test: atest SystemUITests
Change-Id: I07257e97f9699ffd522806ab72c7952ed5876b1a
This commit is contained in:
Josh Tsuji
2022-04-20 17:42:20 -04:00
parent 6584dbb6e6
commit 7b2b1a6020
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2604,6 +2604,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
finishSurfaceBehindRemoteAnimation(cancelled);
mSurfaceBehindRemoteAnimationRequested = false;
// The remote animation is over, so we're not going away anymore.
mKeyguardStateController.notifyKeyguardGoingAway(false);
});
mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(
@@ -2622,6 +2625,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
ActivityTaskManager.getService().keyguardGoingAway(
WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS
| WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER);
mKeyguardStateController.notifyKeyguardGoingAway(true);
} catch (RemoteException e) {
mSurfaceBehindRemoteAnimationRequested = false;
e.printStackTrace();

8
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.policy;
import android.app.IActivityTaskManager;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.policy.KeyguardStateController.Callback;
@@ -233,6 +235,12 @@ public interface KeyguardStateController extends CallbackController<Callback> {
*/
default void onKeyguardFadingAwayChanged() {}
/**
* We've called {@link IActivityTaskManager#keyguardGoingAway}, which initiates the unlock
* sequence.
*/
default void onKeyguardGoingAwayChanged() {}
/**
* Triggered when the keyguard dismiss amount has changed, via either a swipe gesture or an
* animation.

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
View File

@@ -323,6 +323,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum
Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardGoingAway",
keyguardGoingAway ? 1 : 0);
mKeyguardGoingAway = keyguardGoingAway;
new ArrayList<>(mCallbacks).forEach(Callback::onKeyguardGoingAwayChanged);
}
}