am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '3f9ec9f1c2744664ae637b9fbce99c115c60a429':
Disable notification alerts in Settings for SUW
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index 6207391b..ec6e64f 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -22,7 +22,8 @@
<NumberPicker
android:id="@+id/bytes"
- android:layout_width="48dip"
+ android:layout_width="wrap_content"
+ android:minWidth="48dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dip"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 334c4d4..91d92e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -871,7 +871,7 @@
<!-- Hint shown in dialog screen when password is too short -->
<string name="lockpassword_password_too_short">Password must be at least %d characters</string>
<!-- Hint shown in dialog screen when PIN is too short -->
- <string name="lockpassword_pin_too_short">PIN must be at least %d characters</string>
+ <string name="lockpassword_pin_too_short">PIN must be at least %d digits</string>
<!-- Hint shown after minimum password criteria is met -->
<string name="lockpassword_press_continue">Touch Continue when done</string>
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index aa3f2e9..2055af0 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -193,9 +193,14 @@
ar= (AsyncResult) msg.obj;
if (ar.exception == null) {
int type = ((int[])ar.result)[0];
+ if (type >= mPreferredNetworkLabels.length) {
+ Log.e(TAG, "[RadioInfo] EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
+ "type=" + type);
+ type = mPreferredNetworkLabels.length - 1;
+ }
preferredNetworkType.setSelection(type, true);
} else {
- preferredNetworkType.setSelection(8, true);
+ preferredNetworkType.setSelection(mPreferredNetworkLabels.length - 1, true);
}
break;
case EVENT_SET_PREFERRED_TYPE_DONE:
@@ -1009,7 +1014,7 @@
mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView parent, View v, int pos, long id) {
Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
- if (pos>=0 && pos<=7) { //IS THIS NEEDED to extend to the entire range of values
+ if (pos>=0 && pos<=(mPreferredNetworkLabels.length - 2)) {
phone.setPreferredNetworkType(pos, msg);
}
}
@@ -1027,5 +1032,9 @@
"CDMA only",
"EvDo only",
"GSM/CDMA auto (PRL)",
+ "LTE/CDMA auto (PRL)",
+ "LTE/GSM auto (PRL)",
+ "LTE/GSM/CDMA auto (PRL)",
+ "LTE only",
"Unknown"};
}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 460a182..a029342 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -124,7 +124,7 @@
// Did not find a matching activity, so remove the preference
parentPreferenceGroup.removePreference(preference);
- return true;
+ return false;
}
/**
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 715108b..196908e 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -79,7 +79,7 @@
private Account[] mAccounts;
private ArrayList<SyncStateCheckBoxPreference> mCheckBoxes =
new ArrayList<SyncStateCheckBoxPreference>();
- private ArrayList<String> mInvisibleAdapters = Lists.newArrayList();
+ private ArrayList<SyncAdapterType> mInvisibleAdapters = Lists.newArrayList();
@Override
public Dialog onCreateDialog(final int id) {
@@ -321,8 +321,11 @@
}
// plus whatever the system needs to sync, e.g., invisible sync adapters
if (mAccount != null) {
- for (String authority : mInvisibleAdapters) {
- requestOrCancelSync(mAccount, authority, startSync);
+ for (SyncAdapterType syncAdapter : mInvisibleAdapters) {
+ // invisible sync adapters' account type should be same as current account type
+ if (syncAdapter.accountType.equals(mAccount.type)) {
+ requestOrCancelSync(mAccount, syncAdapter.authority, startSync);
+ }
}
}
}
@@ -452,7 +455,7 @@
} else {
// keep track of invisible sync adapters, so sync now forces
// them to sync as well.
- mInvisibleAdapters.add(sa.authority);
+ mInvisibleAdapters.add(sa);
}
}
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 1d1dfaa..d4fea37 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -115,7 +115,7 @@
private Preference mSignalStrength;
private Preference mUptime;
- private static String sUnknown;
+ private String sUnknown;
private Preference mBatteryStatus;
private Preference mBatteryLevel;
@@ -188,9 +188,7 @@
mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
mRes = getResources();
- if (sUnknown == null) {
- sUnknown = mRes.getString(R.string.device_info_default);
- }
+ sUnknown = mRes.getString(R.string.device_info_default);
mPhone = PhoneFactory.getDefaultPhone();
// Note - missing in zaku build, be careful later...