Merge "Remove a few old IA related manifest entries." (430c8d37) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+5 −40

Original line number	Diff line number	Diff line
		@@ -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">
		@@ -3090,17 +3066,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">

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -248,7 +248,6 @@ public class SettingsGateway {
		//wireless_section
		Settings.WifiSettingsActivity.class.getName(),
		Settings.BluetoothSettingsActivity.class.getName(),
		Settings.DataUsageSummaryActivity.class.getName(),
		Settings.SimSettingsActivity.class.getName(),
		Settings.WirelessSettingsActivity.class.getName(),
		//device_section
		@@ -267,7 +266,7 @@ public class SettingsGateway {
		Settings.AccessibilitySettingsActivity.class.getName(),
		Settings.PrintSettingsActivity.class.getName(),
		Settings.PaymentSettingsActivity.class.getName(),
		Settings.EnterprisePrivacySettingsActivity.class.getName(),


		// New IA
		// Home page
		@@ -277,7 +276,6 @@ public class SettingsGateway {
		Settings.AppAndNotificationDashboardActivity.class.getName(),
		Settings.StorageDashboardActivity.class.getName(),
		"com.android.settings.SoundDashboardAlias",
		"com.android.settings.SecurityDashboardAlias",
		"com.android.settings.UsersDashboardAlias",
		Settings.UserAndAccountDashboardActivity.class.getName(),
		Settings.SystemDashboardActivity.class.getName(),
		@@ -286,8 +284,9 @@ public class SettingsGateway {
		"com.android.settings.ManageApplicationsDashboardAlias",
		"com.android.settings.PaymentSettingsDashboardAlias",
		// Home page > Network & Internet
		"com.android.settings.DataUsageDashboardAlias",
		Settings.DataUsageSummaryActivity.class.getName(),
		// Home page > System
		Settings.LanguageAndInputSettingsActivity.class.getName(),
		Settings.EnterprisePrivacySettingsActivity.class.getName(),
		};
		}