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

Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev

Browse Source
This commit is contained in:
Shweta Chahar
2016-02-29 10:39:28 +00:00
committed by Android (Google) Code Review
parent a77940d0f5 6426435b4c
commit b17a56e07f
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/tts_settings.xml
View File

@@ -29,7 +29,8 @@
android:title="@string/tts_default_rate_title" android:title="@string/tts_default_rate_title"
android:summary="@string/tts_default_rate_summary" android:summary="@string/tts_default_rate_summary"
android:defaultValue="50" android:defaultValue="50"
android:max="600" /> android:max="600"
android:layout="@layout/preference_iconless_slider" />
<Preference android:key="reset_speech_rate" <Preference android:key="reset_speech_rate"
android:persistent="false" android:persistent="false"

6
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -89,18 +89,12 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private PreferenceCategory mEnginePreferenceCategory; private PreferenceCategory mEnginePreferenceCategory;
private SeekBarPreference mDefaultRatePref; private SeekBarPreference mDefaultRatePref;
private SwitchPreference mHigherRateSwitchPref;
private Preference mResetSpeechRate; private Preference mResetSpeechRate;
private Preference mPlayExample; private Preference mPlayExample;
private Preference mEngineStatus; private Preference mEngineStatus;
private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE; private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
/**
* Whether higher speech rate is enabled.
*/
private boolean mHigherRateSwitch = false;
/** /**
* The currently selected engine. * The currently selected engine.
*/ */