summaryrefslogtreecommitdiffstats
path: root/tests/AndroidManifest.xml
diff options
context:
space:
mode:
authorAnders Hammar1 <anders.hammar1@sonyericsson.com>2010-04-08 10:03:50 +0200
committerJohan Redestig <johan.redestig@sonyericsson.com>2010-06-11 14:27:29 +0200
commitb2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48 (patch)
treeab7aff6275d3cc777d09398e454426884becbde4 /tests/AndroidManifest.xml
parent3514cdc3b0f88127c418609e29fbb04abb6174cc (diff)
downloadpackages_apps_Settings-b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48.zip
packages_apps_Settings-b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48.tar.gz
packages_apps_Settings-b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48.tar.bz2
Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an operator or a vendor specific application to add an activity of choice in the settings menu. Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
Diffstat (limited to 'tests/AndroidManifest.xml')
-rw-r--r--tests/AndroidManifest.xml21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 8a0ce21..fe4dd95 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -29,8 +29,29 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity android:name="Operator" android:label="Operator Hook Test" >
+ <intent-filter>
+ <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.title" android:resource="@string/operator_settings_title" />
+ <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
+ <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+ </activity>
+ <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
+ <intent-filter>
+ <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.title" android:resource="@string/manufacturer_settings_title" />
+ <meta-data android:name="com.android.settings.summary" android:resource="@string/manufacturer_settings_summary" />
+ <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+ </activity>
</application>
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.settings"
+ android:label="Settings App Tests">
+ </instrumentation>
+
<instrumentation android:name="SettingsLaunchPerformance"
android:targetPackage="com.android.settings"
android:label="Settings Launch Performance">