aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-16 09:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Ensure some taskbar states are initialized correctly" into sc-v2-dev am: 9b3b2b9c7e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16463952

Change-Id: Iaf93223818db835484845e519269d5b9ad47bf6f
This commit is contained in:
TreeHugger Robot
2021-12-14 23:09:02 +00:00
committed by Automerger Merge Worker
parent 76cb3a5c59 9b3b2b9c7e
commit 4ab25b564e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
View File

@@ -111,6 +111,11 @@ import java.util.function.Supplier;
onIconAlignmentRatioChangedForAppAndHomeTransition();
mLauncher.getStateManager().addStateListener(mStateListener);
// Initialize to the current launcher state
updateStateForFlag(FLAG_RESUMED, launcher.hasBeenResumed());
mLauncherState = launcher.getStateManager().getState();
applyState(0);
}
public void onDestroy() {

8
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
View File

@@ -171,9 +171,13 @@ public class TaskbarStashController {
boolean isManuallyStashedInApp = supportsManualStashing()
&& mPrefs.getBoolean(SHARED_PREFS_STASHED_KEY, DEFAULT_STASHED_PREF);
boolean isInSetup = !mActivity.isUserSetupComplete() || sharedState.setupUIVisible;
updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);
updateStateForFlag(FLAG_STASHED_IN_APP_SETUP,
!mActivity.isUserSetupComplete() || sharedState.setupUIVisible);
updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, isInSetup);
if (isInSetup) {
// Update the in-app state to ensure isStashed() reflects right state during SUW
updateStateForFlag(FLAG_IN_APP, true);
}
applyState();
notifyStashChange(/* visible */ false, /* stashed */ isStashedInApp());