Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Code refactor - SIM slot UI preference key"

Browse Source
This commit is contained in:
Bonian Chen
2022-12-06 08:30:50 +00:00
committed by Android (Google) Code Review
parent 6ef041d366 09bd704c45
commit a1e8760494
5 changed files with 214 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
View File

@@ -41,6 +41,7 @@ import com.android.settings.deviceinfo.UptimePreferenceController;
import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -104,14 +105,12 @@ public class MyDeviceInfoFragment extends DashboardFragment
Context context, MyDeviceInfoFragment fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
String simStatusKey = SimStatusPreferenceController.KEY_SIM_STATUS;
SimStatusPreferenceController defaultRecord =
new SimStatusPreferenceController(context, simStatusKey);
for (int slotIndex = 0; slotIndex < defaultRecord.getSimSlotSize(); slotIndex ++) {
final SlotSimStatus slotSimStatus = new SlotSimStatus(context);
for (int slotIndex = 0; slotIndex < slotSimStatus.size(); slotIndex ++) {
SimStatusPreferenceController slotRecord =
new SimStatusPreferenceController(context, simStatusKey + slotIndex + 1);
slotRecord.init(fragment, slotIndex);
new SimStatusPreferenceController(context,
slotSimStatus.getPreferenceKey(slotIndex));
slotRecord.init(fragment, slotSimStatus);
controllers.add(slotRecord);
}

41
src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo.simstatus;
import android.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
@@ -38,39 +37,28 @@ import java.util.List;
public class SimStatusPreferenceController extends BasePreferenceController {
public static final String KEY_SIM_STATUS = "sim_status";
private static final String KEY_PREFERENCE_CATEGORY = "device_detail_category";
private final TelephonyManager mTelephonyManager;
private final SubscriptionManager mSubscriptionManager;
private final List<Preference> mPreferenceList = new ArrayList<>();
private Fragment mFragment;
private int mSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
private SlotSimStatus mSlotSimStatus;
public SimStatusPreferenceController(Context context, String prefKey) {
super(context, prefKey);
mTelephonyManager = context.getSystemService(TelephonyManager.class);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
}
/**
* Initialize this preference controller.
* @param fragment parent fragment
* @param slotIndex index of slot
* @param slotSimStatus SlotSimStatus object
*/
public void init(Fragment fragment, int slotIndex) {
public void init(Fragment fragment, SlotSimStatus slotSimStatus) {
mFragment = fragment;
mSlotIndex = slotIndex;
}
/**
* Get number of subscription slots.
* @return number of slots
*/
public int getSimSlotSize() {
return isAvailable() ? mTelephonyManager.getPhoneCount() : 0;
mSlotSimStatus = slotSimStatus;
}
/**
@@ -78,14 +66,12 @@ public class SimStatusPreferenceController extends BasePreferenceController {
* @return index of slot
*/
public int getSimSlotIndex() {
return mSlotIndex;
return mSlotSimStatus == null ? SubscriptionManager.INVALID_SIM_SLOT_INDEX :
mSlotSimStatus.findSlotIndexByKey(getPreferenceKey());
}
@Override
public int getAvailabilityStatus() {
if (getSimSlotIndex() == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
return UNSUPPORTED_ON_DEVICE;
}
boolean isAvailable = SubscriptionUtil.isSimHardwareVisible(mContext) &&
mContext.getSystemService(UserManager.class).isAdminUser() &&
!Utils.isWifiOnly(mContext);
@@ -98,23 +84,24 @@ public class SimStatusPreferenceController extends BasePreferenceController {
if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
return;
}
final Preference preference = screen.findPreference(KEY_SIM_STATUS);
String basePreferenceKey = mSlotSimStatus.getPreferenceKey(
SubscriptionManager.INVALID_SIM_SLOT_INDEX);
final Preference preference = screen.findPreference(basePreferenceKey);
if (!isAvailable() || preference == null || !preference.isVisible()) {
return;
}
final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
final int simStatusOrder = preference.getOrder();
mSlotSimStatus.setBasePreferenceOrdering(preference.getOrder());
screen.removePreference(preference);
preference.setVisible(false);
// Add additional preferences for each sim in the device
for (int simSlotNumber = 0; simSlotNumber < mTelephonyManager.getPhoneCount();
simSlotNumber++) {
for (int simSlotNumber = 0; simSlotNumber < mSlotSimStatus.size(); simSlotNumber++) {
final Preference multiSimPreference = createNewPreference(screen.getContext());
multiSimPreference.setCopyingEnabled(true);
multiSimPreference.setOrder(simStatusOrder + simSlotNumber + 1);
multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber + 1);
multiSimPreference.setOrder(mSlotSimStatus.getPreferenceOrdering(simSlotNumber));
multiSimPreference.setKey(mSlotSimStatus.getPreferenceKey(simSlotNumber));
category.addPreference(multiSimPreference);
mPreferenceList.add(multiSimPreference);
}
@@ -141,7 +128,7 @@ public class SimStatusPreferenceController extends BasePreferenceController {
}
private String getPreferenceTitle(int simSlot) {
return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
return mSlotSimStatus.size() > 1 ? mContext.getString(
R.string.sim_status_title_sim_slot, simSlot + 1) : mContext.getString(
R.string.sim_status_title);
}

100
src/com/android/settings/deviceinfo/simstatus/SlotSimStatus.java Normal file
View File

@@ -0,0 +1,100 @@
/*
* Copyright (C) 2022 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.content.Context;
import android.telephony.TelephonyManager;
import android.telephony.SubscriptionManager;
import android.util.Log;
/**
* A class for showing a summary of status of sim slots.
*/
public class SlotSimStatus {
private static final String TAG = "SlotSimStatus";
private int mNumberOfSlots;
private int mBasePreferenceOrdering;
private static final String KEY_SIM_STATUS = "sim_status";
/**
* Construct of class.
* @param context Context
*/
public SlotSimStatus(Context context) {
TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
if (telMgr == null) {
return;
}
mNumberOfSlots = telMgr.getPhoneCount();
}
/**
* Set base ordering of Preference.
* @param baseOrdering the base ordering for SIM Status within "About Phone".
*/
public void setBasePreferenceOrdering(int baseOrdering) {
mBasePreferenceOrdering = baseOrdering;
}
/**
* Number of slots available.
* @return number of slots
*/
public int size() {
return mNumberOfSlots;
}
/**
* Get ordering of Preference based on index of slot.
* @param slotIndex index of slot
* @return Preference ordering.
*/
public int getPreferenceOrdering(int slotIndex) {
return mBasePreferenceOrdering + 1 + slotIndex;
}
/**
* Get key of Preference and PreferenceController based on index of slot.
* @param slotIndex index of slot
* @return Preference key.
*/
public String getPreferenceKey(int slotIndex) {
if (slotIndex == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
return KEY_SIM_STATUS;
}
return KEY_SIM_STATUS + (1 + slotIndex);
}
/**
* Get slot index based on Preference key
* @param prefKey is the preference key
* @return slot index.
*/
public int findSlotIndexByKey(String prefKey) {
int simSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX + 1;
try {
simSlotIndex = Integer.parseInt(prefKey.substring(KEY_SIM_STATUS.length()));
} catch (Exception exception) {
Log.w(TAG, "Preference key invalid: " + prefKey +
". Error Msg: " + exception.getMessage());
}
return simSlotIndex - 1;
}
}