RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix res ids

Browse source
This commit is contained in:
Dmitry Donskoy 2018-11-30 13:47:27 +03:00 • committed by Aleksandr Zatsepin
parent 0d0f5796fd
commit 06bd9a32c2
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/res/values/string-arrays.xml
View file

@ -25,9 +25,9 @@
</string-array>
<string-array name="speed_cameras">
<item>@string/pref_map_style_auto</item>
<item>@string/always</item>
<item>@string/never</item>
<item>@string/speedcam_option_auto</item>
<item>@string/speedcam_option_always</item>
<item>@string/speedcam_option_never</item>
</string-array>
<string-array name="speed_cameras_values" translatable="false">

2
android/res/xml/prefs_main.xml
View file

@ -154,7 +154,7 @@
</android.support.v7.preference.PreferenceScreen>
<ListPreference
android:key="@string/pref_speed_cameras"
android:title="@string/pref_speed_cameras_title"
android:title="@string/speedcams_alert_title"
android:entries="@array/speed_cameras"
android:entryValues="@array/speed_cameras_values"
android:defaultValue="@string/auto_enum_value"

6
android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
View file

@ -8,6 +8,7 @@ import android.os.Bundle;
import android.speech.tts.TextToSpeech;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
@ -351,7 +352,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
pref.setOnPreferenceChangeListener(this::onSpeedCamerasPrefSelected);
}
private boolean onSpeedCamerasPrefSelected(Preference preference, Object newValue)
private boolean onSpeedCamerasPrefSelected(@NonNull Preference preference,
@NonNull Object newValue)
{
String speedCamModeValue = (String) newValue;
ListPreference speedCamModeList = (ListPreference) preference;
@ -960,7 +962,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
private final int mModeStringId;
ThemeMode(int modeStringId)
ThemeMode(@StringRes int modeStringId)
{
mModeStringId = modeStringId;
}