summaryrefslogtreecommitdiffstats
path: root/core/tests/coretests/AndroidManifest.xml
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-27 14:53:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-27 14:53:15 -0700
commit5e3562a5a51789ca179895c960827af5a8f0c96d (patch)
treef513bf2858982e70f11e7d246ba41fb44a9f48d0 /core/tests/coretests/AndroidManifest.xml
parent8279c193d1e7cd3b9bcc371feaf73e204cf251e5 (diff)
parentcfe7b9fcfaeda1e79a8673e4005bcb307f9e9313 (diff)
downloadframeworks_base-5e3562a5a51789ca179895c960827af5a8f0c96d.zip
frameworks_base-5e3562a5a51789ca179895c960827af5a8f0c96d.tar.gz
frameworks_base-5e3562a5a51789ca179895c960827af5a8f0c96d.tar.bz2
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313': onDetachedFromWindow is called before onAttachedToWindow
Diffstat (limited to 'core/tests/coretests/AndroidManifest.xml')
-rw-r--r--core/tests/coretests/AndroidManifest.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index 487a00d..18a6d7b 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -96,6 +96,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"/>