From 78e9ff4693283b705f9062b0e7984c8712c951a9 Mon Sep 17 00:00:00 2001
From: Inigo Lopez de Heredia <inigo@akvo.org>
Date: Tue, 26 Aug 2014 16:18:01 +0100
Subject: [PATCH 1/3] [#149] Disable 'save' property in CheckBox views

* The system will not attempt to restore their state, which essentially
relies on the DB to be opened.
---
 app/src/main/res/layout/preferences.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/preferences.xml b/app/src/main/res/layout/preferences.xml
index cf3348ab2..211372356 100644
--- 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"

From 7dd82b922a5358066dea3d774d47d474ce3f4df7 Mon Sep 17 00:00:00 2001
From: Inigo Lopez de Heredia <inigo@akvo.org>
Date: Wed, 27 Aug 2014 11:29:28 +0100
Subject: [PATCH 2/3] [#151] Manually handle locale and layoutDirection changes

* Prevent automatic management of these properties, preventing
the device from restarting the Activity.
* Bump version number
---
 app/src/main/AndroidManifest.xml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index abf6f7c1e..47b3c5f80 100644
--- 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.2" >
 
     <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" />

From 00b635b0e7a269b6d751a86ddb91130123375df2 Mon Sep 17 00:00:00 2001
From: Inigo Lopez de Heredia <inigo@akvo.org>
Date: Wed, 27 Aug 2014 14:46:57 +0100
Subject: [PATCH 3/3] [#151] Use hotfix version naming convention

* Bump 4th digit of the version (hotfix)
---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47b3c5f80..ffeb86b0f 100644
--- 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.2" >
+    android:versionName="2.0.1.1" >
 
     <uses-sdk
         android:minSdkVersion="8"