Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 36469186: DO NOT MERGE WiMAX settings menu

Browse Source 
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
  DO NOT MERGE WiMAX settings menu
This commit is contained in:
TK MUN
2011-03-09 23:11:59 -08:00
committed by Android Git Automerger
parent a4fb8c8684 36469186b7
commit f018bd8cf3
6 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AndroidManifest.xml
View File

@@ -24,6 +24,8 @@
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
@@ -86,6 +88,19 @@
<!-- Top-level settings -->
<activity android:name=".wimax.WimaxSettings" android:label="@string/wimax_settings"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIMAX_SETTINGS" />
<action android:name="android.net.wimax.PICK_WIMAX_NETWORK" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
</activity>
<activity android:name=".wifi.WifiSettings"
android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden"