Merge pull request #1289 from trashkalmar/moved-3d-settingsandroid-550

[android] fix: Perspective view settings moved to Routing group.

8 files changed, 36 insertions, 34 deletions

diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index 478b4fadf5..a86beecd17 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -63,6 +63,6 @@
 
   <string-array name="news_switch_subtitles">
     <item/>
-    <item>@string/pref_map_3d_buildings_subtitle</item>
+    <item/>
   </string-array>
 </resources>
\ No newline at end of file
diff --git a/android/res/xml-v21/prefs_map.xml b/android/res/xml-v21/prefs_map.xml
index b7581a8a89..e0afda2ac4 100644
--- a/android/res/xml-v21/prefs_map.xml
+++ b/android/res/xml-v21/prefs_map.xml
@@ -32,23 +32,15 @@
     android:order="4"/>
 
   <SwitchPreference
-    android:key="@string/pref_3d"
-    android:title="@string/pref_map_3d_title"
-    android:switchTextOn=""
-    android:switchTextOff=""
-    android:order="5"/>
-
-  <SwitchPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
-    android:summary="@string/pref_map_3d_buildings_subtitle"
     android:switchTextOn=""
     android:switchTextOff=""
-    android:order="6"/>
+    android:order="5"/>
 
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="7"/>
+    android:order="6"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml-v21/prefs_route.xml b/android/res/xml-v21/prefs_route.xml
index 10ec5db366..75dea87a18 100644
--- a/android/res/xml-v21/prefs_route.xml
+++ b/android/res/xml-v21/prefs_route.xml
@@ -11,4 +11,10 @@
   <ListPreference
     android:key="@string/pref_tts_language"
     android:title="@string/pref_tts_language_title"/>
+
+  <SwitchPreference
+    android:key="@string/pref_3d"
+    android:title="@string/pref_map_3d_title"
+    android:switchTextOn=""
+    android:switchTextOff=""/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_map.xml b/android/res/xml/prefs_map.xml
index b8dae0d081..dac136f9f4 100644
--- a/android/res/xml/prefs_map.xml
+++ b/android/res/xml/prefs_map.xml
@@ -30,19 +30,13 @@
     android:order="4"/>
 
   <CheckBoxPreference
-    android:key="@string/pref_3d"
-    android:title="@string/pref_map_3d_title"
-    android:order="5"/>
-
-  <CheckBoxPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
-    android:summary="@string/pref_map_3d_buildings_subtitle"
-    android:order="6"/>
+    android:order="5"/>
 
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="7"/>
+    android:order="6"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_route.xml b/android/res/xml/prefs_route.xml
index a604318998..ece3af7c90 100644
--- a/android/res/xml/prefs_route.xml
+++ b/android/res/xml/prefs_route.xml
@@ -9,4 +9,8 @@
   <ListPreference
     android:key="@string/pref_tts_language"
     android:title="@string/pref_tts_language_title"/>
+
+  <CheckBoxPreference
+    android:key="@string/pref_3d"
+    android:title="@string/pref_map_3d_title"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/NewsFragment.java b/android/src/com/mapswithme/maps/NewsFragment.java
index 429fe6a2c6..308e6468ca 100644
--- a/android/src/com/mapswithme/maps/NewsFragment.java
+++ b/android/src/com/mapswithme/maps/NewsFragment.java
@@ -50,7 +50,7 @@ public class NewsFragment extends BaseMwmDialogFragment
       images.recycle();
 
       // TODO: Temporary solution. Remove for the next WhatsNews
-      mSubtitles[0] += "\n\n" + MwmApplication.get().getString(R.string.whats_new_3d_update_maps);
+      mSubtitles[1] += "\n\n" + MwmApplication.get().getString(R.string.whats_new_3d_update_maps);
     }
 
     @Override
diff --git a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
index a3d05100da..ad34e7dccc 100644
--- a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
@@ -122,30 +122,18 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
     else
       getPreferenceScreen().removePreference(pref);
 
-    Framework.Params3dMode _3d = new Framework.Params3dMode();
+    final Framework.Params3dMode _3d = new Framework.Params3dMode();
     Framework.nativeGet3dMode(_3d);
 
-    final TwoStatePreference pref3d = (TwoStatePreference)findPreference(getString(R.string.pref_3d));
     final TwoStatePreference pref3dBuildings = (TwoStatePreference)findPreference(getString(R.string.pref_3d_buildings));
-    pref3d.setChecked(_3d.enabled);
     pref3dBuildings.setChecked(_3d.buildings);
 
-    pref3d.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-    {
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue)
-      {
-        Framework.nativeSet3dMode((Boolean)newValue, pref3dBuildings.isChecked());
-        return true;
-      }
-    });
-
     pref3dBuildings.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
     {
       @Override
       public boolean onPreferenceChange(Preference preference, Object newValue)
       {
-        Framework.nativeSet3dMode(pref3d.isChecked(), (Boolean)newValue);
+        Framework.nativeSet3dMode(_3d.enabled, (Boolean)newValue);
         return true;
       }
     });
diff --git a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
index ed790ac6dc..e058b04e16 100644
--- a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
@@ -13,6 +13,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.sound.LanguageData;
 import com.mapswithme.maps.sound.TtsPlayer;
@@ -150,6 +151,23 @@ public class RoutePrefsFragment extends PreferenceFragment
 
     mPrefEnabled = (TwoStatePreference) findPreference(getString(R.string.pref_tts_enabled));
     mPrefLanguages = (ListPreference) findPreference(getString(R.string.pref_tts_language));
+
+    final Framework.Params3dMode _3d = new Framework.Params3dMode();
+    Framework.nativeGet3dMode(_3d);
+
+    final TwoStatePreference pref3d = (TwoStatePreference)findPreference(getString(R.string.pref_3d));
+    pref3d.setChecked(_3d.enabled);
+
+    pref3d.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    {
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue)
+      {
+        Framework.nativeSet3dMode((Boolean)newValue, _3d.buildings);
+        return true;
+      }
+    });
+
     update();
   }