Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5017dc6 authored by Niels Egberts's avatar Niels Egberts
Browse files

Move settings to their new location according to ux spec. 

This change doesn't add or remove any functionality.

Additionally, make the settings searchable.

Test: mmma packages/apps/Settings + manual testing

Change-Id: Id3e24fd52b49b7373b4f247241cc52f61ffe169e
parent 42c61c10

res/layout/preference_tts_engine.xml

+0 −13
Original line number Diff line number Diff line
@@ -31,17 +31,4 @@ 
        android:maxLines="2"

        android:textAppearance="?android:attr/textAppearanceListItem"

        android:ellipsize="marquee"/>



    <ImageView

        android:id="@+id/tts_engine_settings"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:src="@drawable/ic_settings"

        android:contentDescription="@string/tts_engine_settings_button"

        android:layout_centerVertical="true"

        android:clickable="true"

        android:focusable="true"

        android:background="?android:attr/selectableItemBackground"/>

</LinearLayout>

res/values/strings.xml

+13 −2
Original line number Diff line number Diff line
@@ -4624,9 +4624,20 @@ 
        behalf.  It comes from the <xliff:g id="voice_input_service_app_name">%s</xliff:g>

        application.  Enable the use of this service?</string>









    <!-- On main TTS Settings screen, in default settings section, reset speech rate for synthesized voice to 1x speech rate.-->









    <!-- [CHAR LIMIT=50] The text for the settings section that is used to set a preferred text to speech engine -->









    <string name="tts_engine_preference_title">Preferred engine</string>









    <!-- [CHAR LIMIT=50] The text for a settings screen of the currently set text to speech engine -->









    <string name="tts_engine_settings_title">Engine settings</string>









    <!-- [CHAR LIMIT=50] The text for a button that goes to the speech rate and pitch settings for text to speech. -->









    <string name="tts_sliders_title">Speech rate &amp; pitch</string>









    <!-- [CHAR LIMIT=50] Name for the general text to speech settings section. -->









    <string name="tts_engine_section_title">Engine</string>









    <!-- [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>









    <!-- On main TTS Settings screen, summary for reset speech rate for synthesized voice -->









    <!-- 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>

















    <!-- Power Control Widget -->
































res/xml/tts_engine_settings.xml→res/xml/tts_engine_picker.xml



+23
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2011 The Android Open Source Project









<!-- Copyright (C) 2009 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.








@@ -14,23 +14,10 @@







     limitations under the License.









-->



















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









    <ListPreference









        android:key="tts_default_lang"









        android:title="@string/tts_default_lang_title"









        android:summary="@string/tts_default_lang_summary"









        android:order="100" />









<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









        android:title="@string/tts_settings_title">



















    <Preference









        android:key="tts_engine_settings"









        android:persistent="false"









        android:title="@string/tts_engine_settings_title"









        android:order="200" />









    <PreferenceCategory android:key="tts_engine_preference_category"









        android:title="@string/tts_engine_preference_title"/>



















    <Preference









        android:key="tts_install_data"









        android:persistent="false"









        android:title="@string/tts_install_data_title"









        android:summary="@string/tts_install_data_summary"









        android:order="300" />









</PreferenceScreen>
























res/xml/tts_settings.xml



+29
−27






























Original line number
Diff line number
Diff line







@@ -17,38 +17,40 @@







<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









        android:title="@string/tts_settings_title">



















    <!-- The contents of this category are filled in by the Java code









         based on the list of available engines. -->









    <PreferenceCategory android:key="tts_engine_preference_section"









        android:title="@string/tts_engine_preference_section_title" />









    <PreferenceCategory android:key="tts_engine_section"









         android:title="@string/tts_engine_section_title">



















    <PreferenceCategory android:key="tts_general_section"









         android:title="@string/tts_general_section_title">









        <!-- 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.settingslib.RestrictedPreference android:key="tts_engine_preference"









        android:title="@string/tts_engine_preference_title"









        android:fragment="com.android.settings.tts.TtsEnginePreferenceFragment"/>



















        <Preference android:key="reset_speech_rate"









    <Preference









        android:key="tts_engine_settings"









        android:persistent="false"









            android:title="@string/tts_reset_speech_rate_title"









            android:summary="@string/tts_reset_speech_rate_summary" />









        android:title="@string/tts_engine_settings_title"









        android:order="200" />



















        <Preference android:key="reset_speech_pitch"









    <Preference









        android:key="tts_install_data"









        android:persistent="false"









            android:title="@string/tts_reset_speech_pitch_title"









            android:summary="@string/tts_reset_speech_pitch_summary" />









        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"
































res/xml/tts_sliders.xml
0 → 100644



+46
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2009 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.









-->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









        android:title="@string/tts_settings_title">



















        <!-- 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"/>



















        <Preference android:key="reset_speech_rate"









            android:persistent="false"









            android:title="@string/tts_reset_speech_rate_title"









            android:summary="@string/tts_reset_speech_rate_summary" />



















        <Preference android:key="reset_speech_pitch"









            android:persistent="false"









            android:title="@string/tts_reset_speech_pitch_title"









            android:summary="@string/tts_reset_speech_pitch_summary" />



















</PreferenceScreen>