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

Dynamic preferences for IMEI

Browse Source 
- Support N-sim devices for imei preference

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0dda78b44e0c64ddd69c9a30e90c49f03b2260f3
This commit is contained in:
jeffreyhuang
2017-11-08 14:43:34 -08:00
parent a414573d62
commit 3adafdcc83
9 changed files with 190 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,17 +34,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.RegulatoryInfoPreferenceController;
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
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.SimStatusDualSimPreferenceController;
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -140,8 +139,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
controllers.add(new ImeiInfoDualSimPreferenceController(context, fragment));
controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
controllers.add(new IpAddressPreferenceController(context, lifecycle));