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

Merge branch 'master' into honeycomb-release

Browse Source
This commit is contained in:
The Android Automerger
2010-10-26 07:07:58 -07:00
parent 98c32038a7 838c0f2ad0
commit d0dd97f536
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -718,10 +718,10 @@
<string name="device_admin_title">Device administration</string> <string name="device_admin_title">Device administration</string>
<!-- Title of preference to manage device admins --> <!-- Title of preference to manage device admins -->
<string name="manage_device_admin">Select device administrators</string> <string name="manage_device_admin">Device administrators</string>
<!-- Summary of preference to manage device policies --> <!-- Summary of preference to manage device policies -->
<string name="manage_device_admin_summary">Add or remove device administrators</string> <string name="manage_device_admin_summary">View or deactivate device administrators</string>
<!-- Bluetooth settings --> <!-- Bluetooth settings -->
<!-- Bluetooth settings check box title on Main Settings screen --> <!-- Bluetooth settings check box title on Main Settings screen -->

2
src/com/android/settings/ApnEditor.java
View File

@@ -234,6 +234,8 @@ public class ApnEditor extends PreferenceActivity
int authVal = mCursor.getInt(AUTH_TYPE_INDEX); int authVal = mCursor.getInt(AUTH_TYPE_INDEX);
if (authVal != -1) { if (authVal != -1) {
mAuthType.setValueIndex(authVal); mAuthType.setValueIndex(authVal);
} else {
mAuthType.setValue(null);
} }
} }