From d6846acf0886f86257f1dbdc194c39621c0ba62d Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Wed, 14 Jun 2023 11:26:57 -0700 Subject: [PATCH] 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 --- .../systemui/navigationbar/TaskbarDelegate.java | 1 - .../phone/LightBarTransitionsController.java | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index b96ca7ac29617..3b32313e76a02 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/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; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java index 7bc4fc3c5e471..ae70384aa71ae 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java +++ b/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); } /**