commit c626f00b0131295b9976f47de8ae0253722d2827
author Doris Ling <dling@google.com> Tue Feb 28 11:52:55 2017 -0800
committer Doris Ling <dling@google.com> Tue Feb 28 11:52:55 2017 -0800
tree 294f9f019d27d261654db85402b12c344d0a37e8
parent 4bc25cc2243c875a8470749e0fe749b069ddf624

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4cc7bf0..2549f61 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -904,15 +904,17 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="9">
+            <intent-filter android:priority="7">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DisplaySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                android:value="@string/display_dashboard_summary"/>
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -3055,21 +3057,6 @@
                        android:value="com.android.settings.category.ia.homepage"/>
         </activity-alias>
 
-        <activity-alias android:name="DisplayDashboardAlias"
-                        android:targetActivity="Settings$DisplaySettingsActivity">
-            <intent-filter android:priority="7">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.DisplaySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:value="@string/display_dashboard_summary"/>
-        </activity-alias>
-
         <activity-alias android:name="SoundDashboardAlias"
                         android:targetActivity="Settings$SoundSettingsActivity"
                         android:icon="@drawable/ic_dashboard_sound">