summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-14 11:48:15 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-14 11:48:15 -0700
commit73550d28df4b7ee2faa39cc4b1b4cc854343632a (patch)
tree289d4e7cf36b3a6f98e37dc9efea74b5d141fbd2 /res
parentea38e678537cf740b5f30c1d69c7a332e98cdd2c (diff)
parentb817cb6e398d4f1f9c3822360f325250d6152e60 (diff)
downloadpackages_apps_Settings-73550d28df4b7ee2faa39cc4b1b4cc854343632a.zip
packages_apps_Settings-73550d28df4b7ee2faa39cc4b1b4cc854343632a.tar.gz
packages_apps_Settings-73550d28df4b7ee2faa39cc4b1b4cc854343632a.tar.bz2
merge from froyo-plus-aosp
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
Diffstat (limited to 'res')
-rw-r--r--res/xml/settings.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 0f19442..326c494 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -20,6 +20,20 @@
android:title="@string/settings_label"
android:key="parent">
+ <!-- Operator hook -->
+
+ <com.android.settings.IconPreferenceScreen
+ android:key="operator_settings">
+ <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" />
+ </com.android.settings.IconPreferenceScreen>
+
+ <!-- Manufacturer hook -->
+
+ <com.android.settings.IconPreferenceScreen
+ android:key="manufacturer_settings">
+ <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
+ </com.android.settings.IconPreferenceScreen>
+
<com.android.settings.IconPreferenceScreen
android:title="@string/radio_controls_title"
settings:icon="@drawable/ic_settings_wireless">