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

Commit 2cd52eb0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into... 

Merge "Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev am: 3d2a6f1e am: ea7fe691" into udc-d1-dev-plus-aosp am: 3a9dab42

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23696663



Change-Id: I32e6e8e496cd563aa4e9ffb06383f1c98180d1a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d9dcd1f 3a9dab42

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+0 −1
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
                        return LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION;

                    }

                });

        controller.overrideIconTintForNavMode(true);



        return controller;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java

+1 −10
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public class LightBarTransitionsController implements Dumpable { 
    };



    private final Context mContext;

    private Boolean mOverrideIconTintForNavMode;



    @AssistedInject

    public LightBarTransitionsController(
@@ -275,20 +274,12 @@ public class LightBarTransitionsController implements Dumpable { 
        dispatchDark();

    }



    /**

     * Specify an override value to return for {@link #overrideIconTintForNavMode(boolean)}.

     */

    public void overrideIconTintForNavMode(boolean overrideValue) {

        mOverrideIconTintForNavMode = overrideValue;

    }

    /**

     * Return whether to use the tint calculated in this class for nav icons.

     */

    public boolean supportsIconTintForNavMode(int navigationMode) {

        // In gesture mode, we already do region sampling to update tint based on content beneath.

        return mOverrideIconTintForNavMode != null

                ? mOverrideIconTintForNavMode

                : !QuickStepContract.isGesturalMode(navigationMode);

        return !QuickStepContract.isGesturalMode(navigationMode);

    }



    /**