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

Commit d6846acf authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Remove overrideIconTintForNavMode for Taskbar Nav buttons 

we need to remove this override so taskbar nav button can support light and dark theme with dark intensity value

Test: Pre submit, manual
Bug: 284408922
Flag: Not needed
Change-Id: Idf689bf17ed17809d206563d110de9690505b250
parent 4204be8b

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);

    }



    /**