Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libaddressinput / src / java / src / com / android / i18n / addressinput / RegionDataConstants.java

diff --git a/src/third_party/libaddressinput/src/java/src/com/android/i18n/addressinput/RegionDataConstants.java b/src/third_party/libaddressinput/src/java/src/com/android/i18n/addressinput/RegionDataConstants.java
index 48affab..4f4c5b7 100644 (file)
--- a/src/third_party/libaddressinput/src/java/src/com/android/i18n/addressinput/RegionDataConstants.java
+++ b/src/third_party/libaddressinput/src/java/src/com/android/i18n/addressinput/RegionDataConstants.java
@@ -41,10 +41,8 @@ class RegionDataConstants {
                 "name", "ANDORRA",
                 "lang", "ca",
                 "languages", "ca",
-                "fmt", "%N%n%O%n%A%n%Z %S",
-                "require", "AS",
-                "upper", "S",
-                "state_name_type", "parish",
+                "fmt", "%N%n%O%n%A%n%Z %C",
+                "require", "A",
         }),
         AE(new String[]{
                 "name", "UNITED ARAB EMIRATES",
@@ -311,7 +309,7 @@ class RegionDataConstants {
         }),
         DK(new String[]{
                 "name", "DENMARK",
-                "fmt", "%O%n%N%n%A%n%Z %C",
+                "fmt", "%N%n%O%n%A%n%Z %C",
                 "require", "ACZ",
         }),
         DM(new String[]{
@@ -977,8 +975,9 @@ class RegionDataConstants {
         }),
         RU(new String[]{
                 "name", "RUSSIAN FEDERATION",
-                "fmt", "%Z %C  %n%A%n%O%n%N",
+                "fmt", "%N%n%O%n%A%n%C%n%S%n%Z",
                 "require", "ACZ",
+                "state_name_type", "oblast",
                 "upper", "AC",
         }),
         RW(new String[]{
@@ -1124,6 +1123,7 @@ class RegionDataConstants {
                 "name", "TURKEY",
                 "fmt", "%N%n%O%n%A%n%Z %C/%S",
                 "require", "ACZ",
+                "locality_name_type", "district",
         }),
         TT(new String[]{
                 "name", "TRINIDAD AND TOBAGO",
@@ -1167,7 +1167,7 @@ class RegionDataConstants {
                 "name", "UNITED STATES",
                 "lang", "en",
                 "languages", "en",
-                "fmt", "%N%n%O%n%A%n%C %S %Z",
+                "fmt", "%N%n%O%n%A%n%C, %S %Z",
                 "require", "ACSZ",
                 "upper", "CS",
                 "zip_name_type", "zip",
@@ -1269,6 +1269,7 @@ class RegionDataConstants {
                 "upper", "C",
                 "zip_name_type", "postal",
                 "state_name_type", "province",
+                "locality_name_type", "city",
         });
 
         private String jsonString;