summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Hendrik Wilden <leifhendrik@google.com>2018-05-17 13:33:33 -0700
committerLeif Hendrik Wilden <leifhendrik@google.com>2018-05-23 13:32:31 -0700
commit7da3d6648c20b5a8ea66c80efdb0dabab5838d4c (patch)
tree9adc01356707f312992f25918934c5dc987c8706
parent89e95f4f08b8da669765402e44cca6de56f0ac3a (diff)
downloadTvSettings-7da3d6648c20b5a8ea66c80efdb0dabab5838d4c.tar.gz
Allow user to focus/select disabled preferences.
On the sound preferences screen, when in auto/never mode, the user should be able to scroll down and see all the supported surround sounds formats, even if the switches are disabled. Bug: 76167503 Test: Verified user can now scroll down on sound preferences screen. Change-Id: Ib9e1562bcde8f533e0892803c7f24f3cecf83cf6 Merged-In: Ib9e1562bcde8f533e0892803c7f24f3cecf83cf6
-rw-r--r--Settings/src/com/android/tv/settings/device/sound/SoundFragment.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java b/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
index b929d0235..bb9678a0c 100644
--- a/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
+++ b/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
@@ -26,6 +26,7 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.TwoStatePreference;
import android.text.TextUtils;
@@ -108,7 +109,16 @@ public class SoundFragment extends PreferenceControllerFragment implements
for (Map.Entry<Integer, Boolean> format : mFormats.entrySet()) {
int formatId = format.getKey();
boolean enabled = format.getValue();
- SwitchPreference pref = new SwitchPreference(getPreferenceManager().getContext());
+ SwitchPreference pref = new SwitchPreference(getPreferenceManager().getContext()) {
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ // Enabling the view will ensure that the preference is focusable even if it
+ // the preference is disabled. This allows the user to scroll down over the
+ // disabled surround sound formats and see them all.
+ holder.itemView.setEnabled(true);
+ }
+ };
pref.setTitle(getFormatDisplayName(formatId));
pref.setKey(KEY_SURROUND_SOUND_FORMAT_PREFIX + formatId);
pref.setChecked(enabled);