diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-30 14:22:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-30 14:22:23 +0000 |
| commit | eb60c42df2bc5a985dcb2d4ee8e11d56195d19b1 (patch) | |
| tree | ffa4ece310ff3bccffc7d4cfdbce560889720852 /packages | |
| parent | 0303d9ce70db4cbb4b9052fcd567b04e69405318 (diff) | |
| parent | c0892c6bd6fcb36c676e0666ceea55b264c2a4e2 (diff) | |
| download | frameworks_base-eb60c42df2bc5a985dcb2d4ee8e11d56195d19b1.zip frameworks_base-eb60c42df2bc5a985dcb2d4ee8e11d56195d19b1.tar.gz frameworks_base-eb60c42df2bc5a985dcb2d4ee8e11d56195d19b1.tar.bz2 | |
Merge "Volume: Mark inactive sliders as focusable." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout/volume_dialog_row.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/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 1a6d34e..91e931d 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 0ab0392..3964820 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; |