diff options
| author | 2023-06-16 01:18:49 +0000 | |
|---|---|---|
| committer | 2023-06-16 01:18:49 +0000 | |
| commit | ea7fe691eabdea3a86c2671b390691dc1ad1d741 (patch) | |
| tree | d6d1ff131cb04392ed27b825714d29d51c6dc913 | |
| parent | 389c24db2ec466ccb213fe1ab8f8b64dfe880546 (diff) | |
| parent | 3d2a6f1ef7d12932447388b00847fd8f3217a882 (diff) | |
Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev am: 3d2a6f1ef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23696663
Change-Id: I1eaa73b1b11874519c15ce486ff576f41be66141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java | 11 |
2 files changed, 1 insertions, 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 b96ca7ac2961..3b32313e76a0 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 7bc4fc3c5e47..ae70384aa71a 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( @@ -276,19 +275,11 @@ public class LightBarTransitionsController implements Dumpable { } /** - * 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); } /** |