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

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

Merge "Fix an issue with nav bar translations not being updated" into udc-dev... 

Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9 am: a8e08175

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



Change-Id: Id330daa9c44cad3ef1733ba2319a8b69260ef99b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 216d0053 a8e08175

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

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.quickstep.util.GroupTask; 
import com.android.quickstep.views.RecentsView;



import java.io.PrintWriter;

import java.util.Arrays;



/**

 * A data source which integrates with a Launcher instance
@@ -105,6 +106,10 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 


        // Restore the in-app display progress from before Taskbar was recreated.

        float[] prevProgresses = mControllers.getSharedState().inAppDisplayProgressMultiPropValues;

        // Make a copy of the previous progress to set since updating the multiprop will update

        // the property which also calls onInAppDisplayProgressChanged() which writes the current

        // values into the shared state

        prevProgresses = Arrays.copyOf(prevProgresses, prevProgresses.length);

        for (int i = 0; i < prevProgresses.length; i++) {

            mTaskbarInAppDisplayProgressMultiProp.get(i).setValue(prevProgresses[i]);

        }

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

+9 −0
Original line number Diff line number Diff line
@@ -927,6 +927,15 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
        insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);

    }



    /**

     * Called whenever a new ui controller is set, and should update anything that depends on the

     * ui controller.

     */

    public void onUiControllerChanged() {

        updateNavButtonInAppDisplayProgressForSysui();

        updateNavButtonTranslationY();

    }



    @Override

    public void dumpLogs(String prefix, PrintWriter pw) {

        pw.println(prefix + "NavbarButtonsViewController:");

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

+1 −3
Original line number Diff line number Diff line
@@ -643,9 +643,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
     * Sets a new data-source for this taskbar instance

     */

    public void setUIController(@NonNull TaskbarUIController uiController) {

        mControllers.uiController.onDestroy();

        mControllers.uiController = uiController;

        mControllers.uiController.init(mControllers);

        mControllers.setUiController(uiController);

    }



    /**

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

+13 −0
Original line number Diff line number Diff line
@@ -196,6 +196,19 @@ public class TaskbarControllers { 
        mPostInitCallbacks.clear();

    }



    /**

     * Sets the ui controller.

     */

    public void setUiController(@NonNull TaskbarUIController newUiController) {

        uiController.onDestroy();

        uiController = newUiController;

        uiController.init(this);

        uiController.updateStateForSysuiFlags(mSharedState.sysuiStateFlags);



        // Notify that the ui controller has changed

        navbarButtonsViewController.onUiControllerChanged();

    }



    @Nullable

    public TaskbarSharedState getSharedState() {

        // This should only be null if called before init() and after destroy().