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

am: 742dc0097b

Change-Id: If957235f76ec7b4e60e4aca3070076137bf70504
This commit is contained in:
Rohan Shah
2018-03-24 01:22:58 +00:00
committed by android-build-merger

View File

@@ -2397,6 +2397,10 @@
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<!-- 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">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
@@ -2412,6 +2416,10 @@
android:icon="@drawable/ic_settings_data_usage"
android:taskAffinity="com.android.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>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />