Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4
* changes: Phone number in about phone v2 Dynamic preferences for sim status Dynamic preferences for IMEI
This commit is contained in:
Jeffrey Huang
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
f1b6d629bf
@@ -36,17 +36,16 @@ import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
|
||||
import com.android.settings.deviceinfo.FeedbackPreferenceController;
|
||||
import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;
|
||||
import com.android.settings.deviceinfo.IpAddressPreferenceController;
|
||||
import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
|
||||
import com.android.settings.deviceinfo.imei.ImeiInfoDualSimPreferenceController;
|
||||
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
|
||||
import com.android.settings.deviceinfo.KernelVersionPreferenceController;
|
||||
import com.android.settings.deviceinfo.ManualPreferenceController;
|
||||
import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
|
||||
import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
|
||||
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
|
||||
import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
|
||||
import com.android.settings.deviceinfo.simstatus.SimStatusDualSimPreferenceController;
|
||||
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
|
||||
import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
|
||||
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
|
||||
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
|
||||
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
@@ -130,18 +129,14 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
// Device name
|
||||
|
||||
// Phone number
|
||||
controllers.add(new PhoneNumberPreferenceController(context));
|
||||
|
||||
controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
|
||||
|
||||
controllers.add(new SimStatusDualSimPreferenceController(context, fragment));
|
||||
|
||||
controllers.add(new DeviceModelPreferenceController(context, fragment));
|
||||
|
||||
controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
|
||||
|
||||
controllers.add(new ImeiInfoDualSimPreferenceController(context, fragment));
|
||||
|
||||
controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
|
||||
|
||||
controllers.add(new IpAddressPreferenceController(context, lifecycle));
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.settings.deviceinfo;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.DeviceInfoUtils;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PhoneNumberPreferenceController extends AbstractPreferenceController {
|
||||
|
||||
private final static String KEY_PHONE_NUMBER = "phone_number";
|
||||
|
||||
private final TelephonyManager mTelephonyManager;
|
||||
private final SubscriptionManager mSubscriptionManager;
|
||||
private final List<Preference> mPreferenceList = new ArrayList<>();
|
||||
|
||||
public PhoneNumberPreferenceController(Context context) {
|
||||
super(context);
|
||||
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
mSubscriptionManager = (SubscriptionManager) context.getSystemService(
|
||||
Context.TELEPHONY_SUBSCRIPTION_SERVICE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_PHONE_NUMBER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
final Preference preference = screen.findPreference(getPreferenceKey());
|
||||
mPreferenceList.add(preference);
|
||||
|
||||
final int phonePreferenceOrder = preference.getOrder();
|
||||
// Add additional preferences for each sim in the device
|
||||
for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
|
||||
simSlotNumber++) {
|
||||
final Preference multiSimPreference = createNewPreference(screen.getContext());
|
||||
multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);
|
||||
multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
|
||||
screen.addPreference(multiSimPreference);
|
||||
mPreferenceList.add(multiSimPreference);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
|
||||
final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
|
||||
simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
|
||||
simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
|
||||
}
|
||||
}
|
||||
|
||||
private CharSequence getPhoneNumber(int simSlot) {
|
||||
final SubscriptionInfo subscriptionInfo = getSubscriptionInfo(simSlot);
|
||||
if (subscriptionInfo == null) {
|
||||
return mContext.getString(R.string.device_info_default);
|
||||
}
|
||||
|
||||
return getFormattedPhoneNumber(subscriptionInfo);
|
||||
}
|
||||
|
||||
private CharSequence getPreferenceTitle(int simSlot) {
|
||||
return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
|
||||
R.string.status_number_sim_slot, simSlot + 1) : mContext.getString(
|
||||
R.string.status_number);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
SubscriptionInfo getSubscriptionInfo(int simSlot) {
|
||||
final List<SubscriptionInfo> subscriptionInfoList =
|
||||
mSubscriptionManager.getActiveSubscriptionInfoList();
|
||||
if (subscriptionInfoList != null) {
|
||||
for (SubscriptionInfo info : subscriptionInfoList) {
|
||||
if (info.getSimSlotIndex() == simSlot) {
|
||||
return info;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {
|
||||
final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
|
||||
subscriptionInfo);
|
||||
return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
|
||||
: phoneNumber;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
Preference createNewPreference(Context context) {
|
||||
return new Preference(context);
|
||||
}
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.settings.deviceinfo.imei;
|
||||
|
||||
import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
|
||||
|
||||
/**
|
||||
* Controller that manages preference for single and dual sim devices.
|
||||
*/
|
||||
public abstract class AbstractImeiInfoPreferenceController extends
|
||||
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
protected final boolean mIsMultiSim;
|
||||
protected final TelephonyManager mTelephonyManager;
|
||||
|
||||
private Preference mPreference;
|
||||
private Fragment mFragment;
|
||||
|
||||
public AbstractImeiInfoPreferenceController(Context context, Fragment fragment) {
|
||||
super(context);
|
||||
|
||||
mFragment = fragment;
|
||||
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
if (mPreference == null) {
|
||||
return;
|
||||
}
|
||||
final int phoneType = mTelephonyManager.getPhoneType();
|
||||
if (phoneType == PHONE_TYPE_CDMA) {
|
||||
mPreference.setTitle(getTitleForCdmaPhone());
|
||||
mPreference.setSummary(getMeid());
|
||||
} else {
|
||||
// GSM phone
|
||||
mPreference.setTitle(getTitleForGsmPhone());
|
||||
mPreference.setSummary(mTelephonyManager.getImei(getSimSlot()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ImeiInfoDialogFragment.show(mFragment, getSimSlot(), mPreference.getTitle().toString());
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The preference title for phones based on CDMA technology.
|
||||
*/
|
||||
protected abstract String getTitleForCdmaPhone();
|
||||
|
||||
/**
|
||||
* @return The preference title for phones based on GSM technology.
|
||||
*/
|
||||
protected abstract String getTitleForGsmPhone();
|
||||
|
||||
/**
|
||||
* @return The sim slot to retrieve IMEI/CDMA information about.
|
||||
*/
|
||||
protected abstract int getSimSlot();
|
||||
|
||||
@VisibleForTesting
|
||||
String getMeid() {
|
||||
return mTelephonyManager.getMeid(getSimSlot());
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.settings.deviceinfo.imei;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
public class ImeiInfoDualSimPreferenceController extends AbstractImeiInfoPreferenceController {
|
||||
|
||||
private static final String KEY_IMEI_INFO_DUAL_SIM = "imei_info_sim_slot_2";
|
||||
private static final int SIM_SLOT = 1;
|
||||
|
||||
public ImeiInfoDualSimPreferenceController(Context context, Fragment fragment) {
|
||||
super(context, fragment);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return super.isAvailable() && mIsMultiSim;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_IMEI_INFO_DUAL_SIM;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitleForCdmaPhone() {
|
||||
return mContext.getResources().getString(R.string.meid_multi_sim_sim_slot_2);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitleForGsmPhone() {
|
||||
return mContext.getResources().getString(R.string.imei_multi_sim_slot_2);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSimSlot() {
|
||||
return SIM_SLOT;
|
||||
}
|
||||
}
|
||||
@@ -16,19 +16,41 @@
|
||||
|
||||
package com.android.settings.deviceinfo.imei;
|
||||
|
||||
import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
|
||||
|
||||
public class ImeiInfoPreferenceControllerV2 extends AbstractImeiInfoPreferenceController {
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public static final int SIM_SLOT = 0;
|
||||
/**
|
||||
* Controller that manages preference for single and multi sim devices.
|
||||
*/
|
||||
public class ImeiInfoPreferenceControllerV2 extends
|
||||
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
private static final String KEY_IMEI_INFO = "imei_info_sim_slot_1";
|
||||
private static final String KEY_IMEI_INFO = "imei_info";
|
||||
|
||||
private final boolean mIsMultiSim;
|
||||
private final TelephonyManager mTelephonyManager;
|
||||
private final List<Preference> mPreferenceList = new ArrayList<>();
|
||||
private final Fragment mFragment;
|
||||
|
||||
public ImeiInfoPreferenceControllerV2(Context context, Fragment fragment) {
|
||||
super(context, fragment);
|
||||
super(context);
|
||||
|
||||
mFragment = fragment;
|
||||
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -37,19 +59,69 @@ public class ImeiInfoPreferenceControllerV2 extends AbstractImeiInfoPreferenceCo
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitleForCdmaPhone() {
|
||||
return mIsMultiSim ? mContext.getResources().getString(R.string.meid_multi_sim_sim_slot_1)
|
||||
: mContext.getResources().getString(R.string.status_meid_number);
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
final Preference preference = screen.findPreference(getPreferenceKey());
|
||||
if (!isAvailable() || preference == null || !preference.isVisible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
mPreferenceList.add(preference);
|
||||
updatePreference(preference, 0 /* sim slot */);
|
||||
|
||||
final int imeiPreferenceOrder = preference.getOrder();
|
||||
// Add additional preferences for each sim in the device
|
||||
for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
|
||||
simSlotNumber++) {
|
||||
final Preference multiSimPreference = createNewPreference(screen.getContext());
|
||||
multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
|
||||
multiSimPreference.setKey(KEY_IMEI_INFO + simSlotNumber);
|
||||
screen.addPreference(multiSimPreference);
|
||||
mPreferenceList.add(multiSimPreference);
|
||||
updatePreference(multiSimPreference, simSlotNumber);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitleForGsmPhone() {
|
||||
return mIsMultiSim ? mContext.getResources().getString(R.string.imei_multi_sim_slot_1)
|
||||
: mContext.getResources().getString(R.string.status_imei);
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
final int simSlot = mPreferenceList.indexOf(preference);
|
||||
if (simSlot == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ImeiInfoDialogFragment.show(mFragment, simSlot, preference.getTitle().toString());
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSimSlot() {
|
||||
return SIM_SLOT;
|
||||
private void updatePreference(Preference preference, int simSlot) {
|
||||
final int phoneType = mTelephonyManager.getPhoneType();
|
||||
if (phoneType == PHONE_TYPE_CDMA) {
|
||||
preference.setTitle(getTitleForCdmaPhone(simSlot));
|
||||
preference.setSummary(getMeid(simSlot));
|
||||
} else {
|
||||
// GSM phone
|
||||
preference.setTitle(getTitleForGsmPhone(simSlot));
|
||||
preference.setSummary(mTelephonyManager.getImei(simSlot));
|
||||
}
|
||||
}
|
||||
|
||||
private CharSequence getTitleForGsmPhone(int simSlot) {
|
||||
return mIsMultiSim ? mContext.getString(R.string.imei_multi_sim, simSlot + 1)
|
||||
: mContext.getString(R.string.status_imei);
|
||||
}
|
||||
|
||||
private CharSequence getTitleForCdmaPhone(int simSlot) {
|
||||
return mIsMultiSim ? mContext.getString(R.string.meid_multi_sim, simSlot + 1)
|
||||
: mContext.getString(R.string.status_meid_number);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
String getMeid(int simSlot) {
|
||||
return mTelephonyManager.getMeid(simSlot);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
Preference createNewPreference(Context context) {
|
||||
return new Preference(context);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.settings.deviceinfo.simstatus;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class AbstractSimStatusPreferenceController extends
|
||||
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
protected final boolean mIsMultiSim;
|
||||
protected final TelephonyManager mTelephonyManager;
|
||||
private final SubscriptionManager mSubscriptionManager;
|
||||
private final Fragment mFragment;
|
||||
|
||||
private Preference mPreference;
|
||||
|
||||
public AbstractSimStatusPreferenceController(Context context, Fragment fragment) {
|
||||
super(context);
|
||||
|
||||
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
mSubscriptionManager = (SubscriptionManager) context.getSystemService(
|
||||
Context.TELEPHONY_SUBSCRIPTION_SERVICE);
|
||||
mFragment = fragment;
|
||||
mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
if (mPreference == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
mPreference.setTitle(getPreferenceTitle());
|
||||
mPreference.setSummary(getCarrierName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SimStatusDialogFragment.show(mFragment, getSimSlot(), getPreferenceTitle());
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The preference title for the displayed preference.
|
||||
*/
|
||||
protected abstract String getPreferenceTitle();
|
||||
|
||||
/**
|
||||
* @return The sim slot to retrieve sim status information about.
|
||||
*/
|
||||
protected abstract int getSimSlot();
|
||||
|
||||
private CharSequence getCarrierName() {
|
||||
final List<SubscriptionInfo> subscriptionInfoList =
|
||||
mSubscriptionManager.getActiveSubscriptionInfoList();
|
||||
if (subscriptionInfoList != null) {
|
||||
for (SubscriptionInfo info : subscriptionInfoList) {
|
||||
if (info.getSimSlotIndex() == getSimSlot()) {
|
||||
return info.getCarrierName();
|
||||
}
|
||||
}
|
||||
}
|
||||
return mContext.getText(R.string.device_info_not_available);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.settings.deviceinfo.simstatus;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
public class SimStatusDualSimPreferenceController extends AbstractSimStatusPreferenceController {
|
||||
|
||||
private static final int SIM_SLOT = 1;
|
||||
private static final String SIM_STATUS_DUAL_SIM_KEY = "sim_status_sim_2";
|
||||
|
||||
public SimStatusDualSimPreferenceController(Context context, Fragment fragment) {
|
||||
super(context, fragment);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return super.isAvailable() && mIsMultiSim;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPreferenceTitle() {
|
||||
return mContext.getResources().getString(R.string.sim_status_title_sim_slot_2);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSimSlot() {
|
||||
return SIM_SLOT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return SIM_STATUS_DUAL_SIM_KEY;
|
||||
}
|
||||
}
|
||||
@@ -18,32 +18,107 @@ package com.android.settings.deviceinfo.simstatus;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
|
||||
|
||||
public class SimStatusPreferenceControllerV2 extends AbstractSimStatusPreferenceController {
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public static final int SIM_SLOT = 0;
|
||||
public class SimStatusPreferenceControllerV2 extends
|
||||
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
private static final String KEY_SIM_1_STATUS = "sim_status_sim_1";
|
||||
private static final String KEY_SIM_STATUS = "sim_status";
|
||||
|
||||
private final TelephonyManager mTelephonyManager;
|
||||
private final SubscriptionManager mSubscriptionManager;
|
||||
private final Fragment mFragment;
|
||||
private final List<Preference> mPreferenceList = new ArrayList<>();
|
||||
|
||||
public SimStatusPreferenceControllerV2(Context context, Fragment fragment) {
|
||||
super(context, fragment);
|
||||
}
|
||||
super(context);
|
||||
|
||||
@Override
|
||||
protected String getPreferenceTitle() {
|
||||
return mIsMultiSim ? mContext.getResources().getString(R.string.sim_status_title_sim_slot_1)
|
||||
: mContext.getResources().getString(R.string.sim_status_title);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSimSlot() {
|
||||
return SIM_SLOT;
|
||||
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
mSubscriptionManager = (SubscriptionManager) context.getSystemService(
|
||||
Context.TELEPHONY_SUBSCRIPTION_SERVICE);
|
||||
mFragment = fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_SIM_1_STATUS;
|
||||
return KEY_SIM_STATUS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
final Preference preference = screen.findPreference(getPreferenceKey());
|
||||
if (!isAvailable() || preference == null || !preference.isVisible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
mPreferenceList.add(preference);
|
||||
|
||||
final int simStatusOrder = preference.getOrder();
|
||||
// Add additional preferences for each sim in the device
|
||||
for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
|
||||
simSlotNumber++) {
|
||||
final Preference multiSimPreference = createNewPreference(screen.getContext());
|
||||
multiSimPreference.setOrder(simStatusOrder + simSlotNumber);
|
||||
multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber);
|
||||
screen.addPreference(multiSimPreference);
|
||||
mPreferenceList.add(multiSimPreference);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
|
||||
final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
|
||||
simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber /* sim slot */));
|
||||
simStatusPreference.setSummary(getCarrierName(simSlotNumber /* sim slot */));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
final int simSlot = mPreferenceList.indexOf(preference);
|
||||
if (simSlot == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SimStatusDialogFragment.show(mFragment, simSlot, getPreferenceTitle(simSlot));
|
||||
return true;
|
||||
}
|
||||
|
||||
private String getPreferenceTitle(int simSlot) {
|
||||
return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
|
||||
R.string.sim_status_title_sim_slot, simSlot + 1) : mContext.getString(
|
||||
R.string.sim_status_title);
|
||||
}
|
||||
|
||||
private CharSequence getCarrierName(int simSlot) {
|
||||
final List<SubscriptionInfo> subscriptionInfoList =
|
||||
mSubscriptionManager.getActiveSubscriptionInfoList();
|
||||
if (subscriptionInfoList != null) {
|
||||
for (SubscriptionInfo info : subscriptionInfoList) {
|
||||
if (info.getSimSlotIndex() == simSlot) {
|
||||
return info.getCarrierName();
|
||||
}
|
||||
}
|
||||
}
|
||||
return mContext.getText(R.string.device_info_not_available);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
Preference createNewPreference(Context context) {
|
||||
return new Preference(context);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user