diff options
| author | 2016-12-20 17:51:31 +0000 | |
|---|---|---|
| committer | 2016-12-20 17:51:36 +0000 | |
| commit | 6b33e20879f2a8bc5fbb66c9e345d959baf0dfb3 (patch) | |
| tree | 1d77b3d763331c74926b4d9eb3331c94ffbb7362 | |
| parent | 241d2f6f30f947638695e2d7a8398a173be9544b (diff) | |
| parent | 7f7b8d5fbc854f7e2649e87a7ab47f66150c24c5 (diff) | |
Merge "Change color selector for segment button text"
| -rw-r--r-- | packages/SystemUI/res/color/segmented_button_text_selector.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/SystemUI/res/color/segmented_button_text_selector.xml b/packages/SystemUI/res/color/segmented_button_text_selector.xml index 909a6ddcaab4..537cbb84f647 100644 --- a/packages/SystemUI/res/color/segmented_button_text_selector.xml +++ b/packages/SystemUI/res/color/segmented_button_text_selector.xml @@ -16,8 +16,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_selected="true" android:color="@color/segmented_button_selected"/> - <item android:color="@color/segmented_button_unselected"/> - + <item android:state_selected="true" android:color="?android:attr/textColorPrimary"/> + <item android:alpha="0.58" android:color="?android:attr/colorForeground"/> </selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index e41991aaf369..c7149dff9c86 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -120,8 +120,6 @@ <color name="screen_pinning_request_window_bg">#80000000</color> <color name="segmented_buttons_background">#14FFFFFF</color><!-- 8% white --> - <color name="segmented_button_selected">#FFFFFFFF</color> - <color name="segmented_button_unselected">@*android:color/quaternary_device_default_settings</color> <color name="dark_mode_icon_color_single_tone">#99000000</color> <color name="dark_mode_icon_color_dual_tone_background">#3d000000</color> |