Ensure some taskbar states are initialized correctly
- Update FLAG_IN_APP to account for setup state to ensure that the stashed state is correct. This needs to be done in the stash controller since SUW is the home activity on startup and the launcher state controller will not be initialized until after SUW finishes - Initialize the launcher state and resumed flags in case Launcher restarts while another app is resumed Bug: 204384193 Test: Run through SUW, ensure the background is not visible Change-Id: I5ce061ad16e79226c8428339ccd0b5ac55c07205
This commit is contained in:
parent
be0360c6d8
commit
7f5e4ca06c
|
@ -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() {
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue