summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-09-20 15:13:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-20 15:13:35 -0700
commit5faffefa6308030a41a042129000642f7492ad38 (patch)
tree0748355dffe2ce67c02df0024554138f76329ed1 /AndroidManifest.xml
parent367bb497be57bb4504daf2f9f11ee004348be6d8 (diff)
parent7836e4ad7b838498ca7c7a51dedf6e7defe79dce (diff)
downloadpackages_apps_settings-5faffefa6308030a41a042129000642f7492ad38.zip
packages_apps_settings-5faffefa6308030a41a042129000642f7492ad38.tar.gz
packages_apps_settings-5faffefa6308030a41a042129000642f7492ad38.tar.bz2
Merge "Allow shortcuts to Tethering and Data usage screens."
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 19774fa..3155ccb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -239,11 +239,13 @@
</activity>
<activity android:name="Settings$TetherSettingsActivity"
+ android:label="@string/tether_settings_title_all"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
+ <category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.TetherSettings" />
@@ -1179,6 +1181,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DataUsageSummary" />