Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d827387f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents dcbe9583 c27a43ba

quickstep/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+2 −2
Original line number Diff line number Diff line
@@ -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,