Remove old code from DisplaySettings not used in new IA.

- removed the old display settings xml
- merge DisplayDashboard metadata into DisplaySettingsActivity instead
and remove DisplayDashboard.

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I9280c9b5c586acd9d97602b0fb12025fafca8af5

src/com/android/settings/DisplaySettings.java

@@ -64,11 +64,7 @@ public class DisplaySettings extends DashboardFragment {
 
     @Override
     protected int getPreferenceScreenResId() {
-        if (mDashboardFeatureProvider.isEnabled()) {
-            return R.xml.ia_display_settings;
-        } else {
-            return R.xml.display_settings;
-        }
+        return R.xml.ia_display_settings;
     }
 
     @Override
@@ -104,14 +100,7 @@ public class DisplaySettings extends DashboardFragment {
                     final ArrayList<SearchIndexableResource> result = new ArrayList<>();
 
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    final boolean useNewIA = FeatureFactory.getFactory(context)
-                            .getDashboardFeatureProvider(context)
-                            .isEnabled();
-                    if (useNewIA) {
-                        sir.xmlResId = R.xml.ia_display_settings;
-                    } else {
-                        sir.xmlResId = R.xml.display_settings;
-                    }
+                    sir.xmlResId = R.xml.ia_display_settings;
                     result.add(sir);
                     return result;
                 }

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -283,7 +283,6 @@ public class SettingsGateway {
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
             Settings.AppAndNotificationDashboardActivity.class.getName(),
             "com.android.settings.BatteryDashboardAlias",
-            "com.android.settings.DisplayDashboardAlias",
             "com.android.settings.SoundDashboardAlias",
             "com.android.settings.SecurityDashboardAlias",
             "com.android.settings.UsersDashboardAlias",