OSDN Git Service

Add existing controllers in about phone to v2 fork
authorjeffreyhuang <jeffreyhuang@google.com>
Thu, 19 Oct 2017 21:46:32 +0000 (14:46 -0700)
committerjeffreyhuang <jeffreyhuang@google.com>
Thu, 19 Oct 2017 22:08:43 +0000 (15:08 -0700)
 - Added build number controller
 - Added safety info controller
 - Added regulatory info controller

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icddb9d352b4f739ca1c7cf562dec09530cb41dac

src/com/android/settings/DeviceInfoSettings.java

index c584ac2..41eb6c6 100644 (file)
@@ -120,6 +120,32 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
             Activity activity, Fragment fragment, Lifecycle lifecycle) {
         if (FeatureFlagUtils.isEnabled(DEVICE_INFO_V2_FEATURE_FLAG)) {
             final List<AbstractPreferenceController> controllers = new ArrayList<>();
+
+            // Device name
+
+            // Phone number
+
+            // SIM status
+
+            // Model & hardware
+
+            // IMEI
+
+            // Android version
+
+            // IP address
+
+            // Wifi MAC address
+
+            // Bluetooth Address
+
+            controllers.add(new RegulatoryInfoPreferenceController(context));
+
+            controllers.add(new SafetyInfoPreferenceController(context));
+
+            controllers.add(
+                    new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
+
             return controllers;
         }