Merge "New iteration of the Text-to-Speech settings." (51d6bcca) · Commits · e / os / android_packages_apps_Settings

res/layout/tts_action_buttons.xml

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="bottom"
		android:paddingTop="4dp"
		android:paddingStart="68dp"
		android:paddingEnd="8dp"
		android:orientation="horizontal">

		<Button
		android:id="@+id/tts_play_button"
		style="@style/android:Widget.Material.Button.Colored"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:paddingEnd="8dp"
		android:text="@string/tts_play"/>

		<Button
		android:id="@+id/tts_reset_button"
		style="@style/android:Widget.Material.Button"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:paddingStart="8dp"
		android:text="@string/tts_reset"/>

		</LinearLayout>

res/values/strings.xml

+5 −4

Original line number	Diff line number	Diff line
		@@ -4737,10 +4737,11 @@
		<!-- [CHAR LIMIT=50] Name for the button that goes to the voice selection screen. -->
		<string name="tts_install_voice_title">Voices</string>

		<!-- Reset speech rate for synthesized voice to 1x speech rate in the text to speech settings.-->
		<string name="tts_reset_speech_rate_title">Reset speech rate</string>
		<!-- Summary for reset speech rate for synthesized voice in the text to speech settings.-->
		<string name="tts_reset_speech_rate_summary">Reset the speed at which the text is spoken to normal.</string>
		<!-- Name for button that resets speech rate and pitch for synthesized voice to default values in the text to speech settings.-->
		<string name="tts_reset">Reset</string>

		<!-- Name for buttont hat plays a sample of the currently selected text-to-speech engine. -->
		<string name="tts_play">Play</string>

		<!-- Power Control Widget -->
		<string name="gadget_title">Power control</string>

res/xml/tts_engine_picker.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/tts_settings_title">

		<PreferenceCategory android:key="tts_engine_preference_category"
		android:title="@string/tts_engine_preference_title"/>
		<PreferenceCategory android:key="tts_engine_preference_category"/>

		</PreferenceScreen>

res/xml/tts_settings.xml

+32 −38

Original line number	Diff line number	Diff line
		@@ -14,53 +14,47 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/tts_settings_title">

		<PreferenceCategory android:key="tts_engine_section"
		android:title="@string/tts_engine_section_title">
		<PreferenceCategory android:key="tts_engine_section">

		<com.android.settingslib.RestrictedPreference android:key="tts_engine_preference"
		<com.android.settings.widget.GearPreference
		android:key="tts_engine_preference"
		android:title="@string/tts_engine_preference_title"
		android:fragment="com.android.settings.tts.TtsEnginePreferenceFragment"/>

		<Preference
		android:key="tts_engine_settings"
		android:persistent="false"
		android:title="@string/tts_engine_settings_title"
		android:order="200" />

		<Preference
		android:key="tts_install_data"
		android:persistent="false"
		android:title="@string/tts_install_voice_title"
		android:order="300" />

		</PreferenceCategory>

		<PreferenceCategory android:key="tts_general_section"
		android:title="@string/tts_general_section_title">

		<com.android.settingslib.RestrictedPreference
		android:key="tts_sliders"
		android:title="@string/tts_sliders_title"
		android:fragment="com.android.settings.tts.TtsSlidersFragment"/>

		<ListPreference
		android:key="tts_default_lang"
		android:title="@string/tts_default_lang_title"
		android:summary="@string/tts_default_lang_summary"
		android:persistent="false" />

		<Preference android:key="tts_play_example"
		android:persistent="false"
		android:title="@string/tts_play_example_title"
		android:summary="@string/tts_play_example_summary" />
		</PreferenceCategory>

		<PreferenceCategory android:key="tts_general_section">

		<!-- The max value for seek bars here should be kept in sync
		with the max value specified in TextToSpeechSettings class. -->
		<com.android.settings.SeekBarPreference
		android:key="tts_default_rate"
		android:title="@string/tts_default_rate_title"
		android:summary="@string/tts_default_rate_summary"
		android:defaultValue="50"
		android:max="600"/>

		<com.android.settings.SeekBarPreference
		android:key="tts_default_pitch"
		android:title="@string/tts_default_pitch_title"
		android:summary="@string/tts_default_pitch_summary"
		android:defaultValue="100"
		android:max="400"/>

		<com.android.settings.applications.LayoutPreference
		android:key="action_buttons"
		android:layout="@layout/tts_action_buttons"
		android:selectable="false"/>

		<Preference android:key="tts_status"
		android:enabled="false"
		android:shouldDisableView="false"
		android:persistent="false"
		android:title="@string/tts_status_title"/>
		</PreferenceCategory>
		</PreferenceScreen>

src/com/android/settings/search/SearchIndexableResources.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,6 @@ import com.android.settings.print.PrintSettingsFragment;
		import com.android.settings.sim.SimSettings;
		import com.android.settings.system.SystemDashboardFragment;
		import com.android.settings.tts.TtsEnginePreferenceFragment;
		import com.android.settings.tts.TtsSlidersFragment;
		import com.android.settings.users.UserSettings;
		import com.android.settings.wallpaper.WallpaperTypeSettings;
		import com.android.settings.wifi.ConfigureWifiSettings;
		@@ -171,7 +170,6 @@ public final class SearchIndexableResources {
		addIndex(PaymentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_nfc_payment);
		addIndex(
		TtsEnginePreferenceFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
		addIndex(TtsSlidersFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
		}

		private SearchIndexableResources() {