diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:31:16 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:31:16 +0000 |
| commit | d03280b922064f234d47adc04c8451adcd19ab98 (patch) | |
| tree | d7f3f59cdaf8fecdee7209cc32e432c61889c672 | |
| parent | cf7d776dceb83ddd232a7894c45619f1a5e41284 (diff) | |
| parent | 5a0e8052678aad8d725685368bebbf55504702bf (diff) | |
| download | Launcher3-android13-mainline-tzdata4-release.tar.gz | |
Snap for 10102166 from 5a0e8052678aad8d725685368bebbf55504702bf to mainline-tzdata4-releaseaml_tz4_331910000android13-mainline-tzdata4-release
Change-Id: I45bc3c8b8bf324d5d80796ed7d58fa833bcddb98
| -rw-r--r-- | quickstep/src/com/android/launcher3/QuickstepTransitionManager.java | 2 | ||||
| -rw-r--r-- | quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index e1a3b729c1..9aeb3709ac 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -518,6 +518,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener appsView.setAlpha(startAlpha); SCALE_PROPERTY.set(appsView, startScale); appsView.setLayerType(View.LAYER_TYPE_NONE, null); + mLauncher.resumeExpensiveViewUpdates(); }; } else if (mLauncher.isInState(OVERVIEW)) { endListener = composeViewContentAnimator(launcherAnimator, alphas, scales); @@ -647,6 +648,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener overview.setFreezeViewVisibility(false); SCALE_PROPERTY.set(overview, 1f); mLauncher.getStateManager().reapplyState(); + mLauncher.resumeExpensiveViewUpdates(); }; } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 4fb7e6ba06..bb9fa5e5f2 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -43,6 +43,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; import android.app.ActivityTaskManager; @@ -383,6 +384,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { || mRotationTouchHelper.isTaskListFrozen(); return canStartWithNavHidden && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0 + && (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0 && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0 && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 |