diff options
| author | Irfan Sheriff <isheriff@google.com> | 2009-12-10 15:18:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 15:18:33 -0800 |
| commit | a702cab6cf99c6c2168f0662d9c15adbf76011ab (patch) | |
| tree | 16fc703dd6e03f1dc039dc64e0d2c0582eea3f12 /AndroidManifest.xml | |
| parent | 1ac497b219aef7de2de4449a93666ab4ba5cb181 (diff) | |
| parent | 2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d (diff) | |
| download | packages_apps_Settings-a702cab6cf99c6c2168f0662d9c15adbf76011ab.tar.gz packages_apps_Settings-a702cab6cf99c6c2168f0662d9c15adbf76011ab.tar.bz2 packages_apps_Settings-a702cab6cf99c6c2168f0662d9c15adbf76011ab.zip | |
am 2ff62e2c: Wifi diagnostic app to enable debug and provide information
Merge commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d' into eclair-mr2-plus-aosp
* commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d':
Wifi diagnostic app to enable debug and provide information
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7cb49ddc5..2d9ba45a0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -103,6 +103,39 @@ </intent-filter> </activity> + <activity android:name=".wifi.WifiInfo"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".wifi.WifiConfigInfo"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".wifi.WifiAPITest"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".wifi.WifiStatusTest"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name="ApnSettings" android:label="@string/apn_settings" android:configChanges="orientation|keyboardHidden" android:launchMode="singleTask" |