Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I8d21b03dfec3522d92d6e4b728de76ad99e01371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-06-21 16:47:23 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 2 deletions

View File

@@ -28,6 +28,10 @@
<color name="taskbar_stashed_handle_light_color">#EBffffff</color>
<color name="taskbar_stashed_handle_dark_color">#99000000</color>
<!-- Floating rotation button -->
<color name="floating_rotation_button_light_color">#ffffff</color>
<color name="floating_rotation_button_dark_color">#99000000</color>
<!-- Gesture navigation tutorial -->
<color name="gesture_tutorial_back_arrow_color">#FFFFFFFF</color>

View File

@@ -232,8 +232,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
? new DesktopNavbarButtonsViewController(this, navButtonsView)
: new NavbarButtonsViewController(this, navButtonsView),
new RotationButtonController(this,
c.getColor(R.color.taskbar_nav_icon_light_color),
c.getColor(R.color.taskbar_nav_icon_dark_color),
c.getColor(R.color.floating_rotation_button_light_color),
c.getColor(R.color.floating_rotation_button_dark_color),
R.drawable.ic_sysbar_rotate_button_ccw_start_0,
R.drawable.ic_sysbar_rotate_button_ccw_start_90,
R.drawable.ic_sysbar_rotate_button_cw_start_0,