Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a8254e authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Reapply previous states when recreating the task bar" into tm-qpr-dev... 

Merge "Reapply previous states when recreating the task bar" into tm-qpr-dev am: a097a960 am: f51df33f

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



Change-Id: Ia95dbef74947a2530b8b8f7ceaa371dc2c804acd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6de5f183 f51df33f

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+6 −0
Original line number Diff line number Diff line
@@ -248,6 +248,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        // Initialize controllers after all are constructed.

        mControllers.init(sharedState);

        updateSysuiStateFlags(sharedState.sysuiStateFlags, true /* fromInit */);

        disableNavBarElements(sharedState.disableNavBarDisplayId, sharedState.disableNavBarState1,

                sharedState.disableNavBarState2, false /* animate */);

        onSystemBarAttributesChanged(sharedState.systemBarAttrsDisplayId,

                sharedState.systemBarAttrsBehavior);

        onNavButtonsDarkIntensityChanged(sharedState.navButtonsDarkIntensity);





        if (!mAddedWindow) {

            mWindowManager.addView(mDragLayer, mWindowLayoutParams);

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+6 −0
Original line number Diff line number Diff line
@@ -362,18 +362,24 @@ public class TaskbarManager { 
    }



    public void disableNavBarElements(int displayId, int state1, int state2, boolean animate) {

        mSharedState.disableNavBarDisplayId = displayId;

        mSharedState.disableNavBarState1 = state1;

        mSharedState.disableNavBarState2 = state2;

        if (mTaskbarActivityContext != null) {

            mTaskbarActivityContext.disableNavBarElements(displayId, state1, state2, animate);

        }

    }



    public void onSystemBarAttributesChanged(int displayId, int behavior) {

        mSharedState.systemBarAttrsDisplayId = displayId;

        mSharedState.systemBarAttrsBehavior = behavior;

        if (mTaskbarActivityContext != null) {

            mTaskbarActivityContext.onSystemBarAttributesChanged(displayId, behavior);

        }

    }



    public void onNavButtonsDarkIntensityChanged(float darkIntensity) {

        mSharedState.navButtonsDarkIntensity = darkIntensity;

        if (mTaskbarActivityContext != null) {

            mTaskbarActivityContext.onNavButtonsDarkIntensityChanged(darkIntensity);

        }

quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java

+13 −0
Original line number Diff line number Diff line
@@ -20,8 +20,21 @@ package com.android.launcher3.taskbar; 
 */

public class TaskbarSharedState {



    // TaskbarManager#onSystemUiFlagsChanged

    public int sysuiStateFlags;



    // TaskbarManager#disableNavBarElements()

    public int disableNavBarDisplayId;

    public int disableNavBarState1;

    public int disableNavBarState2;



    // TaskbarManager#onSystemBarAttributesChanged()

    public int systemBarAttrsDisplayId;

    public int systemBarAttrsBehavior;



    // TaskbarManager#onNavButtonsDarkIntensityChanged()

    public float navButtonsDarkIntensity;



    public boolean setupUIVisible = false;



    public boolean allAppsVisible = false;