Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-03-23 19:51:16 +00:00
committed by Android (Google) Code Review

View File

@@ -2397,6 +2397,10 @@
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<!-- TODO(b/70950124): add shortcut intent-filter --> <!-- TODO(b/70950124): add shortcut intent-filter -->
<intent-filter android:priority="1">
<action android:name="android.settings.DATA_USAGE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="10"> <intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
@@ -2412,6 +2416,10 @@
android:icon="@drawable/ic_settings_data_usage" android:icon="@drawable/ic_settings_data_usage"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.DATA_USAGE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />