map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fix: Do not show summary under "Voice instructions".

Browse source
This commit is contained in:
Alexander Marchuk 2015-11-30 15:13:44 +03:00
parent 81f5a07357
commit 579974ecc2
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/xml-v21/prefs_route.xml
View file

@ -5,7 +5,6 @@
<SwitchPreference
android:key="@string/pref_tts_enabled"
android:title="@string/pref_tts_enable_title"
android:summary="@string/pref_tts_enable_summary"
android:switchTextOn=""
android:switchTextOff=""/>

3
android/res/xml/prefs_route.xml
View file

@ -4,8 +4,7 @@
android:persistent="false">
<CheckBoxPreference
android:key="@string/pref_tts_enabled"
android:title="@string/pref_tts_enable_title"
android:summary="@string/pref_tts_enable_summary"/>
android:title="@string/pref_tts_enable_title"/>
<ListPreference
android:key="@string/pref_tts_language"

15
android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
View file

@ -2,19 +2,23 @@ package com.mapswithme.maps.settings;
import android.content.Intent;
import android.os.Bundle;
import android.preference.*;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.TwoStatePreference;
import android.speech.tts.TextToSpeech;
import android.support.annotation.NonNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.mapswithme.maps.R;
import com.mapswithme.maps.sound.LanguageData;
import com.mapswithme.maps.sound.TtsPlayer;
import com.mapswithme.util.Config;
import com.mapswithme.util.statistics.Statistics;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RoutePrefsFragment extends PreferenceFragment
{
private static final int REQUEST_INSTALL_DATA = 1;
@ -112,6 +116,7 @@ public class RoutePrefsFragment extends PreferenceFragment
}
mPrefEnabled.setChecked(TtsPlayer.INSTANCE.isEnabled());
mPrefEnabled.setSummary(null);
final CharSequence[] entries = new CharSequence[languages.size()];
final CharSequence[] values = new CharSequence[languages.size()];