From 06bd9a32c27311bad342cf5f8d839490020b9579 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Fri, 30 Nov 2018 13:47:27 +0300
Subject: [PATCH] [android] Fix res ids

---
 android/res/values/string-arrays.xml                        | 6 +++---
 android/res/xml/prefs_main.xml                              | 2 +-
 .../com/mapswithme/maps/settings/SettingsPrefsFragment.java | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/res/values/string-arrays.xml b/android/res/values/string-arrays.xml
index 3ff5e5b8d0..49aec4adbb 100644
--- a/android/res/values/string-arrays.xml
+++ b/android/res/values/string-arrays.xml
@@ -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">
diff --git a/android/res/xml/prefs_main.xml b/android/res/xml/prefs_main.xml
index 9306d515e3..445cc1ce50 100644
--- a/android/res/xml/prefs_main.xml
+++ b/android/res/xml/prefs_main.xml
@@ -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"
diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
index b9d1f61cfa..a1c3cc067b 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
@@ -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;
     }