summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-06-30 14:22:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 14:22:23 +0000
commiteb60c42df2bc5a985dcb2d4ee8e11d56195d19b1 (patch)
treeffa4ece310ff3bccffc7d4cfdbce560889720852 /packages/SystemUI/src
parent0303d9ce70db4cbb4b9052fcd567b04e69405318 (diff)
parentc0892c6bd6fcb36c676e0666ceea55b264c2a4e2 (diff)
downloadframeworks_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/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java5
1 files changed, 0 insertions, 5 deletions
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;