Add display settings dashboard to new IA.

- Added a activity-alias pointing to displaySettings as top level
  setting item.
- Refactored all preference logic in DisplaySettings into
  PreferenceControllers. During fragment onAttach it installs all
  controllers, and during onResume it updates preference state. Each
  controller listens to its own preference change event.

Bug: 31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 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;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceController;
+
+public class AdditionalSystemUpdatePreferenceController extends PreferenceController {
+
+    private static final String KEY_UPDATE_SETTING = "additional_system_update_settings";
+
+    public AdditionalSystemUpdatePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    protected boolean isAvailable() {
+        return mContext.getResources().getBoolean(
+                com.android.settings.R.bool.config_additional_system_update_setting_enable);
+    }
+
+    @Override
+    protected String getPreferenceKey() {
+        return KEY_UPDATE_SETTING;
+    }
+}

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

@@ -33,17 +33,8 @@ public class ManageStoragePreferenceController extends PreferenceController {
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        if (!isAvailable()) {
-            removePreference(screen, KEY_MANAGE_STORAGE);
-        }
-    }
-
-    @Override
-    public void updateNonIndexableKeys(List<String> keys) {
-        if (!isAvailable()) {
-            keys.add(KEY_MANAGE_STORAGE);
-        }
+    protected String getPreferenceKey() {
+        return KEY_MANAGE_STORAGE;
     }
 
     @Override
@@ -51,10 +42,8 @@ public class ManageStoragePreferenceController extends PreferenceController {
         return false;
     }
 
-    /**
-     * Whether a preference should be available on screen.
-     */
-    private boolean isAvailable() {
+    @Override
+    protected boolean isAvailable() {
         return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled);
     }
 }

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

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -44,23 +45,21 @@ public class StorageDashboardFragment extends DashboardFragment {
         return TAG;
     }
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        addPreferenceController(new ManageStoragePreferenceController(context));
-    }
-
     @Override
     protected String getCategoryKey() {
         return CategoryKey.CATEGORY_STORAGE;
     }
 
     @Override
-    protected void displayResourceTiles() {
-        addPreferencesFromResource(R.xml.storage_dashboard_fragment);
+    protected int getPreferenceScreenResId() {
+        return R.xml.storage_dashboard_fragment;
+    }
 
-        getPreferenceController(ManageStoragePreferenceController.class)
-                .displayPreference(getPreferenceScreen());
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ManageStoragePreferenceController(context));
+        return controllers;
     }
 
     /**

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

@@ -25,7 +25,6 @@ import android.telephony.CarrierConfigManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 
@@ -37,8 +36,7 @@ public class SystemUpdatePreferenceController extends PreferenceController {
 
     private static final String TAG = "SysUpdatePrefContr";
 
-    static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
-    static final String KEY_UPDATE_SETTING = "additional_system_update_settings";
+    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
 
     private final UserManager mUm;
 
@@ -47,30 +45,33 @@ public class SystemUpdatePreferenceController extends PreferenceController {
         mUm = um;
     }
 
+    @Override
+    protected boolean isAvailable() {
+        return mUm.isAdminUser();
+    }
+
+    @Override
+    protected String getPreferenceKey() {
+        return KEY_SYSTEM_UPDATE_SETTINGS;
+    }
+
     @Override
     public void displayPreference(PreferenceScreen screen) {
-        if (isAvailable(mContext, KEY_SYSTEM_UPDATE_SETTINGS)) {
+        if (isAvailable()) {
             Utils.updatePreferenceToSpecificActivityOrRemove(mContext, screen,
                     KEY_SYSTEM_UPDATE_SETTINGS,
                     Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
         } else {
             removePreference(screen, KEY_SYSTEM_UPDATE_SETTINGS);
         }
-
-        if (!isAvailable(mContext, KEY_UPDATE_SETTING)) {
-            removePreference(screen, KEY_UPDATE_SETTING);
-        }
     }
 
     @Override
     public void updateNonIndexableKeys(List<String> keys) {
         // TODO: system update needs to be fixed for non-owner user b/22760654
-        if (!isAvailable(mContext, KEY_SYSTEM_UPDATE_SETTINGS)) {
+        if (!isAvailable()) {
             keys.add(KEY_SYSTEM_UPDATE_SETTINGS);
         }
-        if (!isAvailable(mContext, KEY_UPDATE_SETTING)) {
-            keys.add(KEY_UPDATE_SETTING);
-        }
     }
 
     @Override
@@ -87,21 +88,6 @@ public class SystemUpdatePreferenceController extends PreferenceController {
         return false;
     }
 
-    /**
-     * Whether a preference should be available on screen.
-     */
-    private boolean isAvailable(Context context, String key) {
-        switch (key) {
-            case KEY_SYSTEM_UPDATE_SETTINGS:
-                return mUm.isAdminUser();
-            case KEY_UPDATE_SETTING:
-                return context.getResources().getBoolean(
-                        R.bool.config_additional_system_update_setting_enable);
-            default:
-                return false;
-        }
-    }
-
     /**
      * Trigger client initiated action (send intent) on system update
      */