diff options
| author | Danesh M <daneshm90@gmail.com> | 2012-03-15 23:16:29 -0400 |
|---|---|---|
| committer | Danesh Mondegarian <daneshm90@gmail.com> | 2012-12-07 19:14:30 -0500 |
| commit | 2f6d605cd714813578b1bd96cffa7e53def715be (patch) | |
| tree | e08852d93aa74ee7f4f95a3c914e5a68126e62de /AndroidManifest.xml | |
| parent | 1e139f428ded7fad86fa67abad2486b8ca6c49d6 (diff) | |
| download | packages_apps_Settings-2f6d605cd714813578b1bd96cffa7e53def715be.zip packages_apps_Settings-2f6d605cd714813578b1bd96cffa7e53def715be.tar.gz packages_apps_Settings-2f6d605cd714813578b1bd96cffa7e53def715be.tar.bz2 | |
Apn settings fixes / code maintainence
Depends on : http://review.cyanogenmod.com/#change,13743
Cleanup unecessary resources and use global ones
- This fixes the duplicate id issue currently causing apn's to be un-editable
Bring the ui aspect of the preference up to speed with ics
- Use ics highlight / layout...etc
- Use fragments
Patchset 5 : Remove theme for ApnEditor
Use static access for variables
Patchset 6 : Launch apn editor internally as a fragment
Replace deprecated managedQuery with CursorLoader
Change-Id: I069415b29846f30665ce76e52f04115d1b65e455
Conflicts:
AndroidManifest.xml
Conflicts:
AndroidManifest.xml
res/layout/apn_preference_layout.xml
src/com/android/settings/ApnEditor.java
src/com/android/settings/ApnSettings.java
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f55d7d3..adbd457 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -252,15 +252,17 @@ </intent-filter> </activity-alias> - <activity android:name="ApnSettings" android:label="@string/apn_settings" + <activity android:name="Settings$ApnSettingsActivity" android:label="@string/apn_settings" android:configChanges="orientation|keyboardHidden|screenSize" - android:launchMode="singleTask"> + android:launchMode="singleTask" android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.APN_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> </intent-filter> + <meta-data android:name="com.android.settings.FRAGMENT_CLASS" + android:value="com.android.settings.ApnSettings" /> </activity> <activity android:name="Settings$BluetoothSettingsActivity" @@ -1008,9 +1010,9 @@ <activity android:name=".deviceinfo.MiscFilesHandler" android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> - <activity android:name="ApnEditor" + <activity android:name="Settings$ApnEditorActivity" android:label="@string/apn_edit" - android:theme="@android:style/Theme.Holo.DialogWhenLarge"> + android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.EDIT" /> @@ -1023,6 +1025,8 @@ <category android:name="android.intent.category.DEFAULT" /> <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" /> </intent-filter> + <meta-data android:name="com.android.settings.FRAGMENT_CLASS" + android:value="com.android.settings.ApnEditor" /> </activity> <activity android:name="MediaFormat" android:label="@string/media_format_title"> @@ -1488,6 +1492,8 @@ <activity android:name=".notificationlight.BatteryLightSettings" /> + <activity android:name=".ApnEditor" /> + <activity android:name="Settings$AnonymousStatsActivity" android:label="@string/anonymous_statistics_title" android:configChanges="orientation|keyboardHidden|screenSize" |