From 918b183295052880f41beeb632fa8f14ada81b59 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 8 Jul 2011 16:45:10 +0100
Subject: Merge Chromium at r12.0.742.93: New autofill string

Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
---
 core/java/android/webkit/L10nUtils.java | 3 ++-
 core/res/res/values/strings.xml         | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/L10nUtils.java b/core/java/android/webkit/L10nUtils.java
index 4c42cde5b693..f9d0067d96ea 100644
--- a/core/java/android/webkit/L10nUtils.java
+++ b/core/java/android/webkit/L10nUtils.java
@@ -74,7 +74,8 @@ public class L10nUtils {
         com.android.internal.R.string.autofill_country_code_re,             // IDS_AUTOFILL_COUNTRY_CODE_RE
         com.android.internal.R.string.autofill_area_code_notext_re,         // IDS_AUTOFILL_AREA_CODE_NOTEXT_RE
         com.android.internal.R.string.autofill_phone_prefix_separator_re,   // IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE
-        com.android.internal.R.string.autofill_phone_suffix_separator_re    // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE
+        com.android.internal.R.string.autofill_phone_suffix_separator_re,   // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE
+        com.android.internal.R.string.credit_card_number_preview_format     // IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT
     };
 
     private static Context mApplicationContext;
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 50f8df7f1883..97a8c0b20501 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2085,6 +2085,10 @@
     <!-- Do not translate. Regex used by AutoFill. -->
     <string name="autofill_phone_suffix_separator_re">^-$</string>
 
+    <!-- Do not translate. Regex used by AutoFill. -->
+    <!-- Ex: ************1234 -->
+    <string name="credit_card_number_preview_format">$1</string>
+
     <!-- Title of an application permission, listed so the user can choose whether
         they want to allow the application to do this. -->
     <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string>
-- 
cgit v1.2.3-59-g8ed1b