Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev am: 3d2a6f1ef7

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

Change-Id: I5d489426370bb21dd7bbd0733cd5cf2f7d9d72d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jagrut Desai
2023-06-16 01:20:07 +00:00
committed by Automerger Merge Worker
parent f3f9fef4a2 3d2a6f1ef7
commit 96cb794b3d
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
View File

@@ -224,7 +224,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
return LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION; return LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION;
} }
}); });
controller.overrideIconTintForNavMode(true);
return controller; return controller;
} }

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

@@ -115,7 +115,6 @@ public class LightBarTransitionsController implements Dumpable {
}; };
private final Context mContext; private final Context mContext;
private Boolean mOverrideIconTintForNavMode;
@AssistedInject @AssistedInject
public LightBarTransitionsController( public LightBarTransitionsController(
@@ -275,20 +274,12 @@ public class LightBarTransitionsController implements Dumpable {
dispatchDark(); 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. * Return whether to use the tint calculated in this class for nav icons.
*/ */
public boolean supportsIconTintForNavMode(int navigationMode) { public boolean supportsIconTintForNavMode(int navigationMode) {
// In gesture mode, we already do region sampling to update tint based on content beneath. // In gesture mode, we already do region sampling to update tint based on content beneath.
return mOverrideIconTintForNavMode != null return !QuickStepContract.isGesturalMode(navigationMode);
? mOverrideIconTintForNavMode
: !QuickStepContract.isGesturalMode(navigationMode);
} }
/** /**