[android] calling SaveState/LoadState at particular times.

android/jni/com/mapswithme/maps/Framework.cpp

@@ -79,6 +79,7 @@ namespace android
 
   void Framework::DeleteRenderPolicy()
   {
+    m_work.SaveState();
     LOG(LINFO, ("clearing current render policy."));
     m_work.SetRenderPolicy(0);
   }
@@ -94,6 +95,7 @@ namespace android
 
     try
     {
+      m_work.LoadState();
       m_work.SetRenderPolicy(CreateRenderPolicy(m_videoTimer,
                                                 true,
                                                 rmParams,

android/src/com/mapswithme/maps/MWMActivity.java

@@ -213,9 +213,7 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-
-    setupLayout();
-        
+    
     final String storagePath = getDataStoragePath();
     // create folder if it doesn't exist
     File f = new File(storagePath);
@@ -230,10 +228,12 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
       e.printStackTrace();
     }
 
+    setupLayout();        
+
     setupLanguages();
-    
+
     checkMeasurementSystem();
-    
+
     m_timer = new VideoTimer();
 
     m_locationService = new LocationService(this);

platform/settings.cpp

@@ -60,7 +60,8 @@ namespace Settings
 
   StringStorage & StringStorage::Instance()
   {
-    return m_instance;
+    static StringStorage inst;
+    return inst;
   }
 
   bool StringStorage::GetValue(string const & key, string & outValue)
@@ -78,7 +79,6 @@ namespace Settings
     Save();
   }
 
-  StringStorage StringStorage::m_instance;
 ////////////////////////////////////////////////////////////////////////////////////////////
 
   template <> string ToString<string>(string const & str)

platform/settings.hpp

@@ -10,8 +10,6 @@ namespace Settings
 
   class StringStorage
   {
-    static StringStorage m_instance;
-
     typedef map<string, string> ContainerT;
     ContainerT m_values;