Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev

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

@@ -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

@@ -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);
     }
 
     /**