commit 6257dadb1dc2cd25b902dd4fd9ac234ba6485ebf
author JianYang Liu <jianyliu@google.com> Thu Dec 12 15:21:34 2019 -0800
committer JianYang Liu <jianyliu@google.com> Fri Dec 13 09:59:30 2019 -0800
tree 2434e3cf4693a7488fcbe5fb6c964bf344644568
parent 2d23f495ffbb368c4aec84266c9e5e0b1da030db

Always hide ability to change languages for TTS in CarSettings.

Bug: 146017042
Test: Manual, robolectric
Change-Id: Ib412f78fd902b31c6608ebc2820d341e6c2c04ed

res/xml/text_to_speech_output_fragment.xml

diff --git a/res/xml/text_to_speech_output_fragment.xml b/res/xml/text_to_speech_output_fragment.xml
index 90ab5b0..14b1c92 100644
--- a/res/xml/text_to_speech_output_fragment.xml
+++ b/res/xml/text_to_speech_output_fragment.xml
@@ -26,6 +26,7 @@
     <com.android.car.settings.common.LogicalPreferenceGroup
         android:key="@string/pk_tts_playback_group"
         settings:controller="com.android.car.settings.tts.TtsPlaybackPreferenceController">
+        <!-- Currently disabled in TtsPlaybackPreferenceController -->
         <ListPreference
             android:key="@string/pk_tts_default_language"
             android:persistent="false"

src/com/android/car/settings/tts/TtsPlaybackPreferenceController.java

diff --git a/src/com/android/car/settings/tts/TtsPlaybackPreferenceController.java b/src/com/android/car/settings/tts/TtsPlaybackPreferenceController.java
index 00c8ca8..1e2109f 100644
--- a/src/com/android/car/settings/tts/TtsPlaybackPreferenceController.java
+++ b/src/com/android/car/settings/tts/TtsPlaybackPreferenceController.java
@@ -128,6 +128,9 @@
     protected void updateState(PreferenceGroup preference) {
         boolean isValid = isDefaultLocaleValid();
         mDefaultLanguagePreference.setEnabled(isValid);
+        // Always hide default language preference for now.
+        // TODO: Unhide once product requirements are clarified.
+        mDefaultLanguagePreference.setVisible(false);
         mSpeechRatePreference.setEnabled(isValid);
         mVoicePitchPreference.setEnabled(isValid);
         mResetPreference.setEnabled(isValid);

tests/robotests/src/com/android/car/settings/tts/TtsPlaybackPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/car/settings/tts/TtsPlaybackPreferenceControllerTest.java b/tests/robotests/src/com/android/car/settings/tts/TtsPlaybackPreferenceControllerTest.java
index f5f1df8..673a0bd 100644
--- a/tests/robotests/src/com/android/car/settings/tts/TtsPlaybackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/car/settings/tts/TtsPlaybackPreferenceControllerTest.java
@@ -372,6 +372,8 @@
         mController.refreshUi();
 
         assertThat(mDefaultLanguagePreference.isEnabled()).isFalse();
+        // Default language preference is always hidden
+        assertThat(mDefaultLanguagePreference.isVisible()).isFalse();
         assertThat(mSpeechRatePreference.isEnabled()).isFalse();
         assertThat(mVoicePitchPreference.isEnabled()).isFalse();
         assertThat(mResetPreference.isEnabled()).isFalse();
@@ -387,6 +389,8 @@
         mController.refreshUi();
 
         assertThat(mDefaultLanguagePreference.isEnabled()).isFalse();
+        // Default language preference is always hidden
+        assertThat(mDefaultLanguagePreference.isVisible()).isFalse();
         assertThat(mSpeechRatePreference.isEnabled()).isFalse();
         assertThat(mVoicePitchPreference.isEnabled()).isFalse();
         assertThat(mResetPreference.isEnabled()).isFalse();
@@ -410,6 +414,8 @@
         mController.refreshUi();
 
         assertThat(mDefaultLanguagePreference.isEnabled()).isTrue();
+        // Default language preference is always hidden
+        assertThat(mDefaultLanguagePreference.isVisible()).isFalse();
         assertThat(mSpeechRatePreference.isEnabled()).isFalse();
         assertThat(mVoicePitchPreference.isEnabled()).isFalse();
         assertThat(mResetPreference.isEnabled()).isFalse();
@@ -434,6 +440,8 @@
 
         assertThat(mPreferenceGroup.isEnabled()).isTrue();
         assertThat(mDefaultLanguagePreference.isEnabled()).isTrue();
+        // Default language preference is always hidden
+        assertThat(mDefaultLanguagePreference.isVisible()).isFalse();
         assertThat(mSpeechRatePreference.isEnabled()).isTrue();
         assertThat(mVoicePitchPreference.isEnabled()).isTrue();
         assertThat(mResetPreference.isEnabled()).isTrue();