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

Merge "Don't hide the home handle when it is attaching to the app" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-09 16:45:07 +00:00
committed by Android (Google) Code Review
parent 66e2d492f1 1b4e55943a
commit 204388f153
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/AsyncRotationController.java
View File

@@ -185,6 +185,8 @@ class AsyncRotationController extends FadeAnimationController implements Consume
} }
} else if (navigationBarCanMove || mTransitionOp == OP_CHANGE_MAY_SEAMLESS) { } else if (navigationBarCanMove || mTransitionOp == OP_CHANGE_MAY_SEAMLESS) {
action = Operation.ACTION_SEAMLESS; action = Operation.ACTION_SEAMLESS;
} else if (mDisplayContent.mTransitionController.mNavigationBarAttachedToApp) {
return;
} }
mTargetWindowTokens.put(w.mToken, new Operation(action)); mTargetWindowTokens.put(w.mToken, new Operation(action));
return; return;

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

@@ -234,9 +234,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
private @TransitionState int mState = STATE_PENDING; private @TransitionState int mState = STATE_PENDING;
private final ReadyTracker mReadyTracker = new ReadyTracker(); private final ReadyTracker mReadyTracker = new ReadyTracker();
// TODO(b/188595497): remove when not needed.
/** @see RecentsAnimationController#mNavigationBarAttachedToApp */
private boolean mNavBarAttachedToApp = false;
private int mRecentsDisplayId = INVALID_DISPLAY; private int mRecentsDisplayId = INVALID_DISPLAY;
/** The delay for light bar appearance animation. */ /** The delay for light bar appearance animation. */
@@ -1781,7 +1778,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
if (navWindow == null || navWindow.mToken == null) { if (navWindow == null || navWindow.mToken == null) {
return; return;
} }
mNavBarAttachedToApp = true; mController.mNavigationBarAttachedToApp = true;
navWindow.mToken.cancelAnimation(); navWindow.mToken.cancelAnimation();
final SurfaceControl.Transaction t = navWindow.mToken.getPendingTransaction(); final SurfaceControl.Transaction t = navWindow.mToken.getPendingTransaction();
final SurfaceControl navSurfaceControl = navWindow.mToken.getSurfaceControl(); final SurfaceControl navSurfaceControl = navWindow.mToken.getSurfaceControl();
@@ -1803,8 +1800,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
/** @see RecentsAnimationController#restoreNavigationBarFromApp */ /** @see RecentsAnimationController#restoreNavigationBarFromApp */
void legacyRestoreNavigationBarFromApp() { void legacyRestoreNavigationBarFromApp() {
if (!mNavBarAttachedToApp) return; if (!mController.mNavigationBarAttachedToApp) {
mNavBarAttachedToApp = false; return;
}
mController.mNavigationBarAttachedToApp = false;
if (mRecentsDisplayId == INVALID_DISPLAY) { if (mRecentsDisplayId == INVALID_DISPLAY) {
Slog.e(TAG, "Reparented navigation bar without a valid display"); Slog.e(TAG, "Reparented navigation bar without a valid display");
@@ -1837,6 +1836,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
break; break;
} }
final AsyncRotationController asyncRotationController = dc.getAsyncRotationController();
if (asyncRotationController != null) {
asyncRotationController.accept(navWindow);
}
if (animate) { if (animate) {
final NavBarFadeAnimationController controller = final NavBarFadeAnimationController controller =
new NavBarFadeAnimationController(dc); new NavBarFadeAnimationController(dc);
@@ -1845,6 +1849,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
// Reparent the SurfaceControl of nav bar token back. // Reparent the SurfaceControl of nav bar token back.
t.reparent(navToken.getSurfaceControl(), parent.getSurfaceControl()); t.reparent(navToken.getSurfaceControl(), parent.getSurfaceControl());
} }
// To apply transactions.
dc.mWmService.scheduleAnimationLocked();
} }
private void reportStartReasonsToLogger() { private void reportStartReasonsToLogger() {

5
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -206,6 +206,11 @@ class TransitionController {
*/ */
boolean mBuildingFinishLayers = false; boolean mBuildingFinishLayers = false;
/**
* Whether the surface of navigation bar token is reparented to an app.
*/
boolean mNavigationBarAttachedToApp = false;
private boolean mAnimatingState = false; private boolean mAnimatingState = false;
final Handler mLoggerHandler = FgThread.getHandler(); final Handler mLoggerHandler = FgThread.getHandler();