commit 3d8b442e8d355172418b95665a099f8e803a72d0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 27 18:38:37 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 27 18:38:37 2017 +0000
tree 2f656ebc343a082b28fb90f4c11a77725e84cd17
parent aa8a972ea3b4f6ed7565d05c5ade6d51258b445b
parent 4ca4bd31c3d19c445876b1ce7335b49b7d0dbbcc

Merge "Fix current tab is changed when rotating device"

src/com/android/settings/IccLockSettings.java

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 1ae9711..0517b13 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -80,6 +80,7 @@
     private static final String DIALOG_PIN = "dialogPin";
     private static final String DIALOG_ERROR = "dialogError";
     private static final String ENABLE_TO_STATE = "enableState";
+    private static final String CURRENT_TAB = "currentTab";
 
     // Save and restore inputted PIN code when configuration changed
     // (ex. portrait<-->landscape) during change PIN code
@@ -235,6 +236,10 @@
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+
+            if (savedInstanceState != null && savedInstanceState.containsKey(CURRENT_TAB)) {
+                mTabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB));
+            }
             return view;
         } else {
             mPhone = PhoneFactory.getDefaultPhone();
@@ -326,6 +331,10 @@
         } else {
             super.onSaveInstanceState(out);
         }
+
+        if (mTabHost != null) {
+            out.putString(CURRENT_TAB, mTabHost.getCurrentTabTag());
+        }
     }
 
     private void showPinDialog() {