Pass subId on intent back to call settings.
Use the subscription info helper to configure the intent dispatched
when the UP arrow is clicked so that the user navigates backwards
to Call Settings for the SIM which they have been viewing.
Bug: 18633885
Change-Id: If89a5f280e058d88c13ac52c2070b7a248f63bea
diff --git a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
index 0540547..30ce1fa 100644
--- a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
+++ b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
@@ -25,6 +25,7 @@
private final ArrayList<Preference> mPreferences = new ArrayList<Preference>();
private int mInitIndex = 0;
private Phone mPhone;
+ private SubscriptionInfoHelper mSubscriptionInfoHelper;
@Override
protected void onCreate(Bundle icicle) {
@@ -32,10 +33,10 @@
addPreferencesFromResource(R.xml.gsm_umts_additional_options);
- SubscriptionInfoHelper subscriptionInfoHelper = new SubscriptionInfoHelper(getIntent());
- subscriptionInfoHelper.setActionBarTitle(
+ mSubscriptionInfoHelper = new SubscriptionInfoHelper(getIntent());
+ mSubscriptionInfoHelper.setActionBarTitle(
getActionBar(), getResources(), R.string.additional_gsm_call_settings_with_label);
- mPhone = subscriptionInfoHelper.getPhone();
+ mPhone = mSubscriptionInfoHelper.getPhone();
PreferenceScreen prefSet = getPreferenceScreen();
mCLIRButton = (CLIRListPreference) prefSet.findPreference(BUTTON_CLIR_KEY);
@@ -94,7 +95,7 @@
public boolean onOptionsItemSelected(MenuItem item) {
final int itemId = item.getItemId();
if (itemId == android.R.id.home) { // See ActionBar#setDisplayHomeAsUpEnabled()
- CallFeaturesSetting.goUpToTopLevelSetting(this);
+ CallFeaturesSetting.goUpToTopLevelSetting(this, mSubscriptionInfoHelper);
return true;
}
return super.onOptionsItemSelected(item);