Merge pull request #152 from akvo/hotfix/2.0.2_locale_change

Hotfix/2.0.2 locale change
akvo · Aug 27, 2014 · 1702481 · 1702481
2 parents 5f98c94 + 00b635b
commit 1702481
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.akvo.flow"
     android:versionCode="1"
-    android:versionName="2.0.1" >
+    android:versionName="2.0.1.1" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -27,7 +27,9 @@
         android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:theme="@style/Flow.Theme" >
-        <activity android:name=".activity.SurveyGroupListActivity" >
+        <activity
+            android:name=".activity.SurveyGroupListActivity"
+            android:configChanges="locale|layoutDirection">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,6 +39,7 @@
         <activity
             android:name=".activity.RecordListActivity"
             android:label="@string/record_list_activity"
+            android:configChanges="locale|layoutDirection"
             android:launchMode="singleTop" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -46,25 +49,34 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
-        <activity android:name=".activity.RecordActivity" />
+        <activity android:name=".activity.RecordActivity"
+            android:configChanges="locale|layoutDirection" />
         <activity
             android:name=".activity.SurveyActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.ListUserActivity"
+            android:configChanges="locale|layoutDirection"
             android:label="@string/userlabel" />
-        <activity android:name=".activity.UserEditActivity" />
+        <activity
+            android:name=".activity.UserEditActivity"
+            android:configChanges="locale|layoutDirection" />
         <activity
             android:name=".activity.SettingsActivity"
+            android:configChanges="locale|layoutDirection"
             android:label="@string/settingslabel" />
-        <activity android:name=".activity.PreferencesActivity" />
-        <activity android:name=".activity.ImageBrowserActivity" />
-        <activity android:name=".activity.TransmissionHistoryActivity" />
+        <activity android:name=".activity.PreferencesActivity"
+            android:configChanges="locale|layoutDirection" />
+        <activity android:name=".activity.ImageBrowserActivity"
+            android:configChanges="locale|layoutDirection" />
+        <activity android:name=".activity.TransmissionHistoryActivity"
+            android:configChanges="locale|layoutDirection" />
         <activity
             android:name=".activity.AppUpdateActivity"
             android:label="@string/app_update_activity"
-            android:theme="@style/Flow.Dialog">
+            android:theme="@style/Flow.Dialog"
+            android:configChanges="locale|layoutDirection" >
         </activity>
 
         <service android:name=".service.DataSyncService" />

diff --git a/app/src/main/res/layout/preferences.xml b/app/src/main/res/layout/preferences.xml
@@ -21,7 +21,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_alignParentRight="true" />
+                android:layout_alignParentRight="true"
+                android:saveEnabled="false"/>
 
             <TextView
                 android:id="@+id/lastuserlabel"
@@ -44,7 +45,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_alignParentRight="true" />
+                android:layout_alignParentRight="true"
+                android:saveEnabled="false"/>
 
             <TextView
                 android:id="@+id/screenopttxt"
@@ -75,7 +77,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_alignParentRight="true" />
+                android:layout_alignParentRight="true"
+                android:saveEnabled="false"/>
+
 
             <TextView
                 android:id="@+id/uploadoptionlabel"
@@ -149,7 +153,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_alignParentRight="true" />
+                android:layout_alignParentRight="true"
+                android:saveEnabled="false"/>
 
             <TextView
                 android:id="@+id/beaconlabel"