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 am: b17a56e07f
am: 7a5e279957
* commit '7a5e2799577d50978016572ccb03e55d2654be84':
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.
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index b980f0a..066b044 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -29,7 +29,8 @@
android:title="@string/tts_default_rate_title"
android:summary="@string/tts_default_rate_summary"
android:defaultValue="50"
- android:max="600" />
+ android:max="600"
+ android:layout="@layout/preference_iconless_slider" />
<Preference android:key="reset_speech_rate"
android:persistent="false"
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index dcf50e8..93722a9 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -89,7 +89,6 @@
private PreferenceCategory mEnginePreferenceCategory;
private SeekBarPreference mDefaultRatePref;
- private SwitchPreference mHigherRateSwitchPref;
private Preference mResetSpeechRate;
private Preference mPlayExample;
private Preference mEngineStatus;
@@ -97,11 +96,6 @@
private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
/**
- * Whether higher speech rate is enabled.
- */
- private boolean mHigherRateSwitch = false;
-
- /**
* The currently selected engine.
*/
private String mCurrentEngine;