diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
| commit | 00c406364e7bb6b9191e928b1d1e4be9a7bb0960 (patch) | |
| tree | de071e3e72477517b9131acf3defef51c06dde57 /tests/AndroidManifest.xml | |
| parent | 97ece591a65f5848e527d45501d586e613f379bf (diff) | |
| parent | b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48 (diff) | |
| download | packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.zip packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.gz packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.bz2 | |
merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
Diffstat (limited to 'tests/AndroidManifest.xml')
| -rw-r--r-- | tests/AndroidManifest.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 6b9e050..e125128 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -30,8 +30,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"> |