Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cf91cdb..d5b04c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -707,7 +707,7 @@
<item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint set up</item>
<item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints set up</item>
</plurals>
- <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=22] -->
+ <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -718,7 +718,7 @@
<!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
the user needs to do. -->
<string name="security_settings_fingerprint_enroll_onboard_message_2">Add your fingerprint</string>
- <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=22] -->
+ <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
<!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add - any fingerprints added will be able to do these things.</string>
@@ -730,7 +730,7 @@
<string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
<!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
<string name="security_settings_fingerprint_enroll_introduction_continue">Continue</string>
- <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=22] -->
+ <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_find_sensor_title">Find the sensor</string>
<!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
<string name="security_settings_fingerprint_enroll_find_sensor_message">
@@ -743,15 +743,15 @@
<string name="security_settings_fingerprint_enroll_dialog_ok">OK</string>
<!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
<string name="security_settings_fingerprint_enroll_dialog_delete">Delete</string>
- <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=22]-->
+ <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
<string name="security_settings_fingerprint_enroll_start_title">Let\u2019s start!</string>
<!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
<string name="security_settings_fingerprint_enroll_start_message">Put your finger on the sensor and lift after you feel a vibration</string>
- <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=28] -->
+ <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_repeat_title">Great! Now repeat</string>
<!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
<string name="security_settings_fingerprint_enroll_repeat_message">Move your finger slightly to add all the different parts of your fingerprint</string>
- <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=22] -->
+ <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added!</string>
<!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
<string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string>
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 9ead7c6..1f0cad1 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -37,8 +37,10 @@
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.text.TextUtils;
+import android.text.format.DateFormat;
import android.util.Log;
import android.widget.Toast;
+
import com.android.internal.logging.MetricsLogger;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Index;
@@ -47,9 +49,13 @@
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -102,6 +108,14 @@
findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
String patch = Build.VERSION.SECURITY_PATCH;
if (!"".equals(patch)) {
+ try {
+ SimpleDateFormat template = new SimpleDateFormat("yyyy-MM-dd");
+ Date patchDate = template.parse(patch);
+ String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
+ patch = DateFormat.format(format, patchDate).toString();
+ } catch (ParseException e) {
+ // broken parse; fall through and use the raw string
+ }
setStringSummary(KEY_SECURITY_PATCH, patch);
} else {
getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH));