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

Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev

Browse Source
This commit is contained in:
Stanley Wang
2021-07-19 02:10:21 +00:00
committed by Android (Google) Code Review
parent 57b189b1cd 1fcdafbcda
commit 2ea54cc143
8 changed files with 237 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -29,6 +29,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -40,7 +41,8 @@ import java.util.List;
public class PhoneNumberPreferenceController extends BasePreferenceController {
private final static String KEY_PHONE_NUMBER = "phone_number";
private static final String KEY_PHONE_NUMBER = "phone_number";
private static final String KEY_PREFERENCE_CATEGORY = "basic_info_category";
private final TelephonyManager mTelephonyManager;
private final SubscriptionManager mSubscriptionManager;
@@ -66,6 +68,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final Preference preference = screen.findPreference(getPreferenceKey());
final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
mPreferenceList.add(preference);
final int phonePreferenceOrder = preference.getOrder();
@@ -76,7 +79,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);
multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
multiSimPreference.setSelectable(false);
screen.addPreference(multiSimPreference);
category.addPreference(multiSimPreference);
mPreferenceList.add(multiSimPreference);
}
}

6
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View File

@@ -27,6 +27,7 @@ import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -42,6 +43,8 @@ import java.util.List;
*/
public class ImeiInfoPreferenceController extends BasePreferenceController {
private static final String KEY_PREFERENCE_CATEGORY = "device_detail_category";
private final boolean mIsMultiSim;
private final TelephonyManager mTelephonyManager;
private final List<Preference> mPreferenceList = new ArrayList<>();
@@ -61,6 +64,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final Preference preference = screen.findPreference(getPreferenceKey());
final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
mPreferenceList.add(preference);
updatePreference(preference, 0 /* simSlot */);
@@ -72,7 +76,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
final Preference multiSimPreference = createNewPreference(screen.getContext());
multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
multiSimPreference.setKey(getPreferenceKey() + simSlotNumber);
screen.addPreference(multiSimPreference);
category.addPreference(multiSimPreference);
mPreferenceList.add(multiSimPreference);
updatePreference(multiSimPreference, simSlotNumber);
}

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

@@ -24,6 +24,7 @@ import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -37,6 +38,7 @@ public class SimStatusPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
private 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;
@@ -64,6 +66,7 @@ public class SimStatusPreferenceController extends
if (!isAvailable() || preference == null || !preference.isVisible()) {
return;
}
final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
mPreferenceList.add(preference);
@@ -74,7 +77,7 @@ public class SimStatusPreferenceController extends
final Preference multiSimPreference = createNewPreference(screen.getContext());
multiSimPreference.setOrder(simStatusOrder + simSlotNumber);
multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber);
screen.addPreference(multiSimPreference);
category.addPreference(multiSimPreference);
mPreferenceList.add(multiSimPreference);
}
}