PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge pointer/tts categories into one without heading" into oc-dev

Browse Source
This commit is contained in:
Fan Zhang
2017-04-27 23:33:59 +00:00
committed by Android (Google) Code Review
parent 646d996865 496fd0ca34
commit 4f4fe03a6e
5 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -3933,8 +3933,6 @@
<!-- Summary text for keyboards when no layout has been selected. [CHAR LIMIT=35] -->
<string name="default_keyboard_layout">Default</string>
<!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
<string name="pointer_settings_category">Mouse/trackpad</string>
<!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->
<string name="pointer_speed">Pointer speed</string>
@@ -4845,8 +4843,6 @@
<string name="voice_search_settings_title">Voice search</string>
<!-- Title of keyboard settings list item within voice input/output settings -->
<string name="keyboard_settings_title">Android keyboard</string>
<!-- Title for the 'voice input' category of voice input/output settings -->
<string name="voice_category">Speech</string>
<!-- Voice input settings --><skip />
<!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->

11
res/xml/language_and_input.xml
View File

@@ -97,22 +97,13 @@
</PreferenceCategory>
<PreferenceCategory
android:key="pointer_settings_category"
android:title="@string/pointer_settings_category">
<PreferenceCategory>
<com.android.settings.PointerSpeedPreference
android:key="pointer_speed"
android:title="@string/pointer_speed"
android:dialogTitle="@string/pointer_speed"/>
</PreferenceCategory>
<!-- TTS -->
<PreferenceCategory
android:key="voice_category"
android:title="@string/voice_category">
<Preference
android:key="tts_settings"
android:title="@string/tts_settings_title"

11
src/com/android/settings/language/TtsPreferenceController.java
View File

@@ -18,14 +18,11 @@ package com.android.settings.language;
import android.content.Context;
import android.speech.tts.TtsEngines;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
public class TtsPreferenceController extends PreferenceController {
private static final String KEY_VOICE_CATEGORY = "voice_category";
private static final String KEY_TTS_SETTINGS = "tts_settings";
private final TtsEngines mTtsEngines;
@@ -40,14 +37,6 @@ public class TtsPreferenceController extends PreferenceController {
return !mTtsEngines.getEngines().isEmpty();
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (!isAvailable()) {
removePreference(screen, KEY_VOICE_CATEGORY);
}
}
@Override
public String getPreferenceKey() {
return KEY_TTS_SETTINGS;

6
tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
View File

@@ -38,9 +38,7 @@ import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -94,7 +92,7 @@ public class TtsPreferenceControllerTest {
mController.displayPreference(mScreen);
// Remove both category and preference.
verify(mScreen, times(2)).removePreference(any(Preference.class));
// Remove preference.
verify(mScreen).removePreference(any(Preference.class));
}
}

2
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -125,7 +125,7 @@ public class BaseSearchIndexProviderTest {
"key_user_dictionary_settings", "gesture_settings_category", "gesture_assist",
"gesture_swipe_down_fingerprint", "gesture_double_tap_power",
"gesture_double_twist", "gesture_double_tap_screen", "gesture_pick_up",
"pointer_settings_category", "pointer_speed", "voice_category", "tts_settings",
"pointer_speed", "tts_settings",
"game_controller_settings_category", "vibrate_input_devices");
}