From c0892c6bd6fcb36c676e0666ceea55b264c2a4e2 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Tue, 30 Jun 2015 10:17:37 -0400 Subject: [PATCH] Volume: Mark inactive sliders as focusable. Enabled but inactive sliders ought to be focusable, just not focused. Bug: 22096089 Change-Id: I95cdfc1b1258ca0e4562761031f4ee59bd35e7e3 --- packages/SystemUI/res/layout/volume_dialog_row.xml | 2 ++ .../src/com/android/systemui/volume/VolumeDialog.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml index 1a6d34e4f9659..91e931da1f3ee 100644 --- a/packages/SystemUI/res/layout/volume_dialog_row.xml +++ b/packages/SystemUI/res/layout/volume_dialog_row.xml @@ -50,6 +50,8 @@ android:layout_below="@id/volume_row_header" android:layout_toEndOf="@id/volume_row_icon" android:layout_toStartOf="@+id/volume_settings_button" + android:focusable="true" + android:focusableInTouchMode="true" android:paddingEnd="8dp" android:paddingStart="8dp" /> diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 0ab0392d412ba..3964820f6e1a6 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -741,12 +741,7 @@ public class VolumeDialog { private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) { if (isActive && mExpanded) { - row.slider.setFocusable(true); - row.slider.setFocusableInTouchMode(true); row.slider.requestFocus(); - } else { - row.slider.setFocusableInTouchMode(false); - row.slider.setFocusable(false); } final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveSliderTint : mInactiveSliderTint;