Add MSIM support for FDN.
Show title and get the Phone object to modify FDN settings for
according to subscription..
+ Add helper to provide common functionality for setting/getting
extras, getting the appropriate phone for a given subscription id,
and other miscellaneous things.
+ Show the subscription label in actionbar title of Call settings,
FDN settings, and FDN list. I didn't do this for edit/delete because
they have really long titles, and the context didn't seem necessary
at that point.
+ Pass the subscription label/id along in intents to the various FDN
setting activities.
+ Get the correct phone, so FDN setting changes are SIM-specific.
+ Take into account subscription id when providing a Uri for
modifying FDN settings, so that FDN contacts can be modified on a
per-sim basis.
- Delete some unused strings.
Bug: 18233666
Bug: 18232723
Bug: 18114923
Change-Id: I05c7149382adb7e7af36d38bab8a6875d5b20609
diff --git a/src/com/android/phone/SubscriptionInfoHelper.java b/src/com/android/phone/SubscriptionInfoHelper.java
new file mode 100644
index 0000000..926a156
--- /dev/null
+++ b/src/com/android/phone/SubscriptionInfoHelper.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.phone;
+
+import android.app.ActionBar;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+
+import com.android.phone.PhoneGlobals;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+/**
+ * Helper for manipulating intents or components with subscription-related information.
+ *
+ * In settings, subscription ids and labels are passed along to indicate that settings
+ * are being changed for particular subscriptions. This helper provides functions for
+ * helping extract this info and perform common operations using this info.
+ */
+public class SubscriptionInfoHelper {
+ private static final int NO_SUB_ID = -1;
+
+ // Extra on intent containing the id of a subscription.
+ private static final String SUB_ID_EXTRA =
+ "com.android.phone.settings.SubscriptionInfoHelper.SubscriptionId";
+ // Extra on intent containing the label of a subscription.
+ private static final String SUB_LABEL_EXTRA =
+ "com.android.phone.settings.SubscriptionInfoHelper.SubscriptionLabel";
+
+ private static int mSubId = NO_SUB_ID;
+ private static String mSubLabel;
+
+ /**
+ * Instantiates the helper, by extracting the subscription id and label from the intent.
+ */
+ public SubscriptionInfoHelper(Intent intent) {
+ mSubId = intent.getIntExtra(SUB_ID_EXTRA, NO_SUB_ID);
+ mSubLabel = intent.getStringExtra(SUB_LABEL_EXTRA);
+ }
+
+ /**
+ * @param context The context.
+ * @param newActivityClass The class of the activity for the intent to start.
+ * @return Intent containing extras for the subscription id and label if they exist.
+ */
+ public Intent getIntent(Context context, Class newActivityClass) {
+ Intent intent = new Intent(context, newActivityClass);
+
+ if (hasSubId()) {
+ intent.putExtra(SUB_ID_EXTRA, mSubId);
+ }
+
+ if (!TextUtils.isEmpty(mSubLabel)) {
+ intent.putExtra(SUB_LABEL_EXTRA, mSubLabel);
+ }
+
+ return intent;
+ }
+
+ public static void addExtrasToIntent(Intent intent, SubInfoRecord subscription) {
+ intent.putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA, subscription.getSubscriptionId());
+ intent.putExtra(
+ SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName().toString());
+ }
+
+ /**
+ * @return Phone object. If a subscription id exists, it returns the phone for the id.
+ */
+ public Phone getPhone() {
+ return hasSubId()
+ ? PhoneFactory.getPhone(SubscriptionManager.getPhoneId(mSubId))
+ : PhoneGlobals.getPhone();
+ }
+
+ /**
+ * Sets the action bar title to the string specified by the given resource id, formatting
+ * it with the subscription label. This assumes the resource string is formattable with a
+ * string-type specifier.
+ *
+ * If the subscription label does not exists, leave the existing title.
+ */
+ public void setActionBarTitle(ActionBar actionBar, Resources res, int resId) {
+ if (actionBar == null || TextUtils.isEmpty(mSubLabel)) {
+ return;
+ }
+
+ String title = String.format(res.getString(resId), mSubLabel);
+ actionBar.setTitle(title);
+ }
+
+ public boolean hasSubId() {
+ return mSubId != NO_SUB_ID;
+ }
+
+ public int getSubId() {
+ return mSubId;
+ }
+}