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

Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev

Browse Source 
am: 071f62954d

Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69
This commit is contained in:
Fan Zhang
2016-07-07 00:20:59 +00:00
committed by android-build-merger
parent e4b305a0f0 071f62954d
commit 93acb63447
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -32,6 +32,8 @@ import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@@ -377,17 +379,39 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
private final Context mContext; private final Context mContext;
private final SummaryLoader mSummaryLoader; private final SummaryLoader mSummaryLoader;
private final SubscriptionManager mSubscriptionManager;
private final SubscriptionChangeListener mSubscriptionChangeListener;
public SummaryProvider(Context context, SummaryLoader summaryLoader) { public SummaryProvider(Context context, SummaryLoader summaryLoader) {
mContext = context; mContext = context;
mSummaryLoader = summaryLoader; mSummaryLoader = summaryLoader;
mSubscriptionManager = SubscriptionManager.from(mContext);
mSubscriptionChangeListener = new SubscriptionChangeListener();
} }
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening) {
mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary, updateSummary();
Build.VERSION.RELEASE)); mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionChangeListener);
} else {
mSubscriptionManager.removeOnSubscriptionsChangedListener(
mSubscriptionChangeListener);
}
}
private void updateSummary() {
final String formattedPhoneNumbers = DeviceInfoUtils.getFormattedPhoneNumbers(
mContext, mSubscriptionManager.getActiveSubscriptionInfoList());
mSummaryLoader.setSummary(SummaryProvider.this, formattedPhoneNumbers);
}
private final class SubscriptionChangeListener
extends SubscriptionManager.OnSubscriptionsChangedListener {
@Override
public void onSubscriptionsChanged() {
updateSummary();
} }
} }
} }

17
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.deviceinfo; package com.android.settings.deviceinfo;
import static android.content.Context.CARRIER_CONFIG_SERVICE;
import static android.content.Context.TELEPHONY_SERVICE;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -32,7 +29,6 @@ import android.os.UserManager;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.CellBroadcastMessage; import android.telephony.CellBroadcastMessage;
import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
@@ -58,9 +54,13 @@ import com.android.internal.telephony.PhoneFactory;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settingslib.DeviceInfoUtils;
import java.util.List; import java.util.List;
import static android.content.Context.CARRIER_CONFIG_SERVICE;
import static android.content.Context.TELEPHONY_SERVICE;
/** /**
* Display the following information * Display the following information
@@ -393,13 +393,10 @@ public class SimStatus extends SettingsPreferenceFragment {
mShowICCID = carrierConfig.getBoolean( mShowICCID = carrierConfig.getBoolean(
CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL); CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL);
String rawNumber = mTelephonyManager.getLine1Number(mSir.getSubscriptionId());
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
}
// If formattedNumber is null or empty, it'll display as "Unknown". // If formattedNumber is null or empty, it'll display as "Unknown".
setSummaryText(KEY_PHONE_NUMBER, formattedNumber); setSummaryText(KEY_PHONE_NUMBER,
DeviceInfoUtils.getFormattedPhoneNumber(getContext(), mSir));
setSummaryText(KEY_IMEI, mPhone.getImei()); setSummaryText(KEY_IMEI, mPhone.getImei());
setSummaryText(KEY_IMEI_SV, mPhone.getDeviceSvn()); setSummaryText(KEY_IMEI_SV, mPhone.getDeviceSvn());