Add configs to display/hide a few tiles in device info page

- Displaying/hiding Emergency info, branded account, device header
  widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController

Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes: 119607340
Test: robotests

src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java

@@ -32,11 +32,10 @@ import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.overlay.FeatureFactory;
 
 public class BrandedAccountPreferenceController extends BasePreferenceController {
-    private static final String KEY_PREFERENCE_TITLE = "branded_account";
     private final Account[] mAccounts;
 
-    public BrandedAccountPreferenceController(Context context) {
-        super(context, KEY_PREFERENCE_TITLE);
+    public BrandedAccountPreferenceController(Context context, String key) {
+        super(context, key);
         final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
                 mContext).getAccountFeatureProvider();
         mAccounts = accountFeatureProvider.getAccounts(mContext);
@@ -44,6 +43,10 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
+        if (!mContext.getResources().getBoolean(
+                R.bool.config_show_branded_account_in_device_info)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
         if (mAccounts != null && mAccounts.length > 0) {
             return AVAILABLE;
         }
@@ -55,7 +58,7 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
         super.displayPreference(screen);
         final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
                 mContext).getAccountFeatureProvider();
-        final Preference accountPreference = screen.findPreference(KEY_PREFERENCE_TITLE);
+        final Preference accountPreference = screen.findPreference(getPreferenceKey());
         if (accountPreference != null && (mAccounts == null || mAccounts.length == 0)) {
             screen.removePreference(accountPreference);
             return;

src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java

@@ -43,8 +43,6 @@ public class DeviceNamePreferenceController extends BasePreferenceController
         LifecycleObserver,
         OnSaveInstanceState,
         OnCreate {
-    private static final String PREF_KEY = "device_name";
-    public static final int DEVICE_NAME_SET_WARNING_ID = 1;
     private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name";
     private String mDeviceName;
     protected WifiManager mWifiManager;
@@ -54,8 +52,8 @@ public class DeviceNamePreferenceController extends BasePreferenceController
     private DeviceNamePreferenceHost mHost;
     private String mPendingDeviceName;
 
-    public DeviceNamePreferenceController(Context context) {
-        super(context, PREF_KEY);
+    public DeviceNamePreferenceController(Context context, String key) {
+        super(context, key);
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator();
@@ -67,7 +65,7 @@ public class DeviceNamePreferenceController extends BasePreferenceController
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);
+        mPreference = screen.findPreference(getPreferenceKey());
         final CharSequence deviceName = getSummary();
         mPreference.setSummary(deviceName);
         mPreference.setText(deviceName.toString());
@@ -94,11 +92,6 @@ public class DeviceNamePreferenceController extends BasePreferenceController
                 : UNSUPPORTED_ON_DEVICE;
     }
 
-    @Override
-    public String getPreferenceKey() {
-        return PREF_KEY;
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         mPendingDeviceName = (String) newValue;

src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java

@@ -28,10 +28,8 @@ import android.view.View;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.accounts.EmergencyInfoPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
-import com.android.settings.deviceinfo.BrandedAccountPreferenceController;
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;
 import com.android.settings.deviceinfo.DeviceModelPreferenceController;
 import com.android.settings.deviceinfo.DeviceNamePreferenceController;
@@ -82,6 +80,7 @@ public class MyDeviceInfoFragment extends DashboardFragment
         use(FirmwareVersionPreferenceController.class).setHost(this /* parent */);
         use(DeviceModelPreferenceController.class).setHost(this /* parent */);
         use(ImeiInfoPreferenceController.class).setHost(this /* parent */);
+        use(DeviceNamePreferenceController.class).setHost(this /* parent */);
         mBuildNumberPreferenceController = use(BuildNumberPreferenceController.class);
         mBuildNumberPreferenceController.setHost(this /* parent */);
     }
@@ -104,23 +103,12 @@ public class MyDeviceInfoFragment extends DashboardFragment
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getActivity(), this /* fragment */,
-                getSettingsLifecycle());
+        return buildPreferenceControllers(context, this /* fragment */, getSettingsLifecycle());
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(
-            Context context, Activity activity, MyDeviceInfoFragment fragment,
-            Lifecycle lifecycle) {
+            Context context, MyDeviceInfoFragment fragment, Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new EmergencyInfoPreferenceController(context));
-        controllers.add(new BrandedAccountPreferenceController(context));
-        DeviceNamePreferenceController deviceNamePreferenceController =
-                new DeviceNamePreferenceController(context);
-        deviceNamePreferenceController.setHost(fragment);
-        if (lifecycle != null) {
-            lifecycle.addObserver(deviceNamePreferenceController);
-        }
-        controllers.add(deviceNamePreferenceController);
         controllers.add(new SimStatusPreferenceController(context, fragment));
         controllers.add(new IpAddressPreferenceController(context, lifecycle));
         controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
@@ -145,12 +133,18 @@ public class MyDeviceInfoFragment extends DashboardFragment
     private void initHeader() {
         // TODO: Migrate into its own controller.
         final LayoutPreference headerPreference =
-                (LayoutPreference) getPreferenceScreen().findPreference(KEY_MY_DEVICE_INFO_HEADER);
-        final View appSnippet = headerPreference.findViewById(R.id.entity_header);
+                getPreferenceScreen().findPreference(KEY_MY_DEVICE_INFO_HEADER);
+        final boolean shouldDisplayHeader = getContext().getResources().getBoolean(
+                R.bool.config_show_device_header_in_device_info);
+        headerPreference.setVisible(shouldDisplayHeader);
+        if (!shouldDisplayHeader) {
+            return;
+        }
+        final View headerView = headerPreference.findViewById(R.id.entity_header);
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
         final EntityHeaderController controller = EntityHeaderController
-                .newInstance(context, this, appSnippet)
+                .newInstance(context, this, headerView)
                 .setRecyclerView(getListView(), getSettingsLifecycle())
                 .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
                         EntityHeaderController.ActionType.ACTION_NONE);
@@ -197,8 +191,8 @@ public class MyDeviceInfoFragment extends DashboardFragment
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {
-                    return buildPreferenceControllers(context, null /* activity */,
-                            null /* fragment */, null /* lifecycle */);
+                    return buildPreferenceControllers(context, null /* fragment */,
+                            null /* lifecycle */);
                 }
             };
 }

src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java

@@ -35,7 +35,7 @@ public class TopLevelAboutDevicePreferenceController extends BasePreferenceContr
     @Override
     public CharSequence getSummary() {
         final DeviceNamePreferenceController deviceNamePreferenceController =
-            new DeviceNamePreferenceController(mContext);
+                new DeviceNamePreferenceController(mContext, "dummy_key");
         return deviceNamePreferenceController.getSummary();
     }
 }