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

Revert \"About Phone\" summary back to Android version.

Browse Source 
am: fd4f729e1f

Change-Id: I77f3ed00516c02f8ca6ad888c166ed07a2f0f7f9
This commit is contained in:
Fan Zhang
2016-07-25 23:08:17 +00:00
committed by android-build-merger
parent a988f59ce8 fd4f729e1f
commit 942e24d46f
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,6 @@ 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;
@@ -379,39 +377,17 @@ 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) {
updateSummary(); mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,
mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionChangeListener); Build.VERSION.RELEASE));
} 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();
} }
} }
} }