PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix current tab is changed when rotating device" am: 3d8b442e8d am: 35a3260b91

Browse Source 
am: 5dbb625508

Change-Id: I28f87722babcc0a297d3ca99a042f8e03138a6fa
This commit is contained in:
Qi Ding
2017-10-27 18:57:41 +00:00
committed by android-build-merger
parent 34f7b5af59 5dbb625508
commit 315d274055
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/IccLockSettings.java
View File

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