diff options
| author | Conley Owens <cco3@android.com> | 2011-04-27 16:58:24 -0700 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2011-04-27 16:58:24 -0700 |
| commit | c4791bd65cdf2e487c87da0d863140337e5141cb (patch) | |
| tree | 8f60404ca050d20e58efa4d9b32defe618acd67f /core/tests/coretests/AndroidManifest.xml | |
| parent | eedf20c2eafde695a5ae50570a21d5449d6903ea (diff) | |
| parent | 5e3562a5a51789ca179895c960827af5a8f0c96d (diff) | |
| download | frameworks_base-c4791bd65cdf2e487c87da0d863140337e5141cb.zip frameworks_base-c4791bd65cdf2e487c87da0d863140337e5141cb.tar.gz frameworks_base-c4791bd65cdf2e487c87da0d863140337e5141cb.tar.bz2 | |
Merge commit '5e3562a5' into m
Conflicts:
core/java/android/view/ViewRoot.java
Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
Diffstat (limited to 'core/tests/coretests/AndroidManifest.xml')
| -rw-r--r-- | core/tests/coretests/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index 4be6995..010e3c3 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -100,6 +100,12 @@ <application android:theme="@style/Theme"> <uses-library android:name="android.test.runner" /> + <activity android:name="android.view.ViewAttachTestActivity" android:label="View Attach Test"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" /> + </intent-filter> + </activity> <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser"> <intent-filter> <action android:name="android.intent.action.MAIN"/> |