diff --git a/packages/SystemUI/res/drawable/tv_volume_row_seek_bar.xml b/packages/SystemUI/res/drawable/tv_volume_row_seek_bar.xml new file mode 100644 index 0000000000000..fe76b639f15ab --- /dev/null +++ b/packages/SystemUI/res/drawable/tv_volume_row_seek_bar.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/tv_volume_row_seek_thumb.xml b/packages/SystemUI/res/drawable/tv_volume_row_seek_thumb.xml new file mode 100644 index 0000000000000..588782ddf3169 --- /dev/null +++ b/packages/SystemUI/res/drawable/tv_volume_row_seek_thumb.xml @@ -0,0 +1,26 @@ + + + + + + + @color/tv_volume_dialog_seek_thumb_shadow + @dimen/tv_volume_seek_bar_thumb_shadow_radius + @dimen/tv_volume_seek_bar_thumb_shadow_dy + diff --git a/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml b/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml index d28d5664d7257..4f6cb0140d099 100644 --- a/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml +++ b/packages/SystemUI/res/layout-land-television/volume_dialog_row.xml @@ -40,7 +40,7 @@ android:fontFeatureSettings="tnum" android:background="@drawable/tv_volume_dialog_circle" android:textSize="@dimen/tv_volume_number_text_size" - android:textColor="@color/accent_tint_color_selector"/> + android:textColor="@color/tv_volume_dialog_accent"/> - 200dp - 17dp - 36dp - 40dp - 5dp - 16dp + 224dp + 58dp + 20dp + 42dp + 42dp + 8dp + 19sp + 5dp + 30dp + 11dp + 24dp + 4.0 + 4.0 diff --git a/packages/SystemUI/res/values-television/config.xml b/packages/SystemUI/res/values-television/config.xml index 981a953127369..29c3ad4bb77bb 100644 --- a/packages/SystemUI/res/values-television/config.xml +++ b/packages/SystemUI/res/values-television/config.xml @@ -45,4 +45,7 @@ true + + + false diff --git a/packages/SystemUI/res/values/colors_tv.xml b/packages/SystemUI/res/values/colors_tv.xml index 1177bb5757c2b..23ca24a6c9a14 100644 --- a/packages/SystemUI/res/values/colors_tv.xml +++ b/packages/SystemUI/res/values/colors_tv.xml @@ -28,5 +28,9 @@ #FFCC0000 #E61F232B #08FFFFFF + #1AFFFFFF + #40000000 + #193C4043 + #FFF8F9FA #FFDADCE0 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index ab09a967bc266..446ed3eee3d20 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -562,4 +562,7 @@ false + + + true diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 78f83d3c09b42..43754a2e94ae9 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -155,6 +155,7 @@ public class VolumeDialogImpl implements VolumeDialog, private boolean mShowA11yStream; private final boolean mShowLowMediaVolumeIcon; + private final boolean mChangeVolumeRowTintWhenInactive; private int mActiveStream; private int mPrevActiveStream; @@ -183,6 +184,8 @@ public class VolumeDialogImpl implements VolumeDialog, Prefs.getBoolean(context, Prefs.Key.HAS_SEEN_ODI_CAPTIONS_TOOLTIP, false); mShowLowMediaVolumeIcon = mContext.getResources().getBoolean(R.bool.config_showLowMediaVolumeIcon); + mChangeVolumeRowTintWhenInactive = + mContext.getResources().getBoolean(R.bool.config_changeVolumeRowTintWhenInactive); } @Override @@ -1154,6 +1157,9 @@ public class VolumeDialogImpl implements VolumeDialog, row.slider.requestFocus(); } boolean useActiveColoring = isActive && row.slider.isEnabled(); + if (!useActiveColoring && !mChangeVolumeRowTintWhenInactive) { + return; + } final ColorStateList tint = useActiveColoring ? Utils.getColorAccent(mContext) : Utils.getColorAttr(mContext, android.R.attr.colorForeground);