Prevent orientation changes from destroying/recreating security settings

Logic in SecuritySettings deliberately recreates the entire preference
tree in onResume rather than onCreate.  This causes the state to be
lost when the orientation changes.

Instead of destroying/recreating when the orientation changes, handle
it ourselves.

Change-Id: I6276d8f97cb64a4823286f263642926561d7f2d0

3 files changed, 10 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 523d4cc..ed8d6ed 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -394,6 +394,12 @@
                 android:parentActivityName="Settings">
         </activity>
 
+        <activity android:name=".SubSettings$SecuritySubSettings"
+                android:taskAffinity="com.android.settings"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:parentActivityName="Settings">
+        </activity>
+
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
                 android:taskAffinity="">
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index 13ead6e..2bf451e 100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
@@ -36,4 +36,5 @@ public class SubSettings extends SettingsActivity {
         return true;
     }
     public static class BluetoothSubSettings extends SubSettings { /* empty */ }
+    public static class SecuritySubSettings extends SubSettings { /* empty */ }
 }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 5c58193..49b93e6 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -867,6 +867,9 @@ public final class Utils {
         if (BluetoothSettings.class.getName().equals(fragmentName)) {
             intent.setClass(context, SubSettings.BluetoothSubSettings.class);
             intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
+         } else if (SecuritySettings.class.getName().equals(fragmentName)) {
+            intent.setClass(context, SubSettings.SecuritySubSettings.class);
+            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
          } else {
              intent.setClass(context, SubSettings.class);
          }