commit 52ed61e225a659dceff9f011b50e016a8c5570b0
author Fan Zhang <zhfan@google.com> Thu Mar 02 13:51:14 2017 -0800
committer Fan Zhang <zhfan@google.com> Thu Mar 02 17:11:26 2017 -0800
tree 19ee911b6d3377f136d73a04437ee791f9f14dc6
parent 64fee1cfe1c202f244415ceacd48e77618941f00

Remove a few old IA related manifest entries.

Bug: 35764802
Test: make RunSettingsRoboTests (no regression)
Change-Id: Icda86964032bb56363c24821e480ac91d614ee54

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c8ba07..571d500 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1032,7 +1032,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.development" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ProcessStatsSummary" />
         </activity>
@@ -1287,11 +1287,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="2">
+            <intent-filter android:priority="4">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.personal" />
+                       android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.SecuritySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2378,11 +2378,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="1">
+            <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
+                android:value="com.android.settings.category.ia.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.datausage.DataUsageSummary" />
         </activity>
@@ -2977,17 +2977,6 @@
                        android:value="@string/network_dashboard_summary"/>
         </activity>
 
-        <activity-alias android:name="DataUsageDashboardAlias"
-                        android:targetActivity="Settings$DataUsageSummaryActivity">
-            <intent-filter android:priority="10">
-                <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.wireless"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.datausage.DataUsageSummary"/>
-        </activity-alias>
-
         <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
                   android:label="@string/connected_devices_dashboard_title"
                   android:icon="@drawable/ic_devices_other">
@@ -3030,19 +3019,6 @@
                        android:value="true" />
         </activity>
 
-        <activity-alias android:name="SecurityDashboardAlias"
-                android:targetActivity="Settings$SecuritySettingsActivity">
-            <intent-filter android:priority="4">
-                <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.SecuritySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
         <activity android:name=".Settings$UserAndAccountDashboardActivity"
                   android:label="@string/account_dashboard_title"
                   android:icon="@drawable/ic_dashboard_user">
@@ -3089,17 +3065,6 @@
                        android:resource="@string/support_summary"/>
         </activity>
 
-        <activity-alias android:name="MemorySettingsDashboardAlias"
-                        android:targetActivity=".Settings$MemorySettingsActivity">
-            <intent-filter>
-                <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.development" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ProcessStatsSummary" />
-        </activity-alias>
-
         <activity-alias android:name="ManageApplicationsDashboardAlias"
                         android:targetActivity="Settings$ManageApplicationsActivity">
             <intent-filter android:priority="200">