Merge "Resources for "Support datalist for date/time input types on Android"" into master-chromium

5 files changed, 55 insertions, 2 deletions

diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java
index 926b3cb..e944710 100644
--- a/chromium/java/com/android/webview/chromium/ResourceProvider.java
+++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java
@@ -73,6 +73,10 @@ public class ResourceProvider {
         org.chromium.content.R.id.ampm = com.android.internal.R.id.webviewchromium_ampm;
         org.chromium.content.R.id.date_picker =
                 com.android.internal.R.id.webviewchromium_date_picker;
+        org.chromium.content.R.id.date_time_suggestion_value =
+                com.android.internal.R.id.webviewchromium_date_time_suggestion_value;
+        org.chromium.content.R.id.date_time_suggestion_label =
+                com.android.internal.R.id.webviewchromium_date_time_suggestion_label;
         org.chromium.content.R.id.hour = com.android.internal.R.id.webviewchromium_hour;
         org.chromium.content.R.id.milli = com.android.internal.R.id.webviewchromium_milli;
         org.chromium.content.R.id.minute = com.android.internal.R.id.webviewchromium_minute;
@@ -131,6 +135,8 @@ public class ResourceProvider {
 
         org.chromium.content.R.layout.date_time_picker_dialog =
                 com.android.internal.R.layout.webviewchromium_date_time_picker_dialog;
+        org.chromium.content.R.layout.date_time_suggestion =
+                com.android.internal.R.layout.webviewchromium_date_time_suggestion;
         org.chromium.content.R.layout.two_field_date_picker =
                 com.android.internal.R.layout.webviewchromium_two_field_date_picker;
         org.chromium.content.R.layout.multi_field_time_picker_dialog =
@@ -173,6 +179,8 @@ public class ResourceProvider {
                 com.android.internal.R.string.webviewchromium_date_picker_dialog_set;
         org.chromium.content.R.string.date_picker_dialog_title =
                 com.android.internal.R.string.webviewchromium_date_picker_dialog_title;
+        org.chromium.content.R.string.date_picker_dialog_other_button_label =
+                com.android.internal.R.string.webviewchromium_date_picker_dialog_other_button_label;
         org.chromium.content.R.string.date_time_picker_dialog_title =
                 com.android.internal.R.string.webviewchromium_date_time_picker_dialog_title;
         org.chromium.content.R.string.media_player_error_button =
@@ -199,6 +207,8 @@ public class ResourceProvider {
                 com.android.internal.R.string.webviewchromium_time_picker_dialog_am;
         org.chromium.content.R.string.time_picker_dialog_pm =
                 com.android.internal.R.string.webviewchromium_time_picker_dialog_pm;
+        org.chromium.content.R.string.time_picker_dialog_title =
+                com.android.internal.R.string.webviewchromium_time_picker_dialog_title;
         org.chromium.content.R.string.week_picker_dialog_title =
                 com.android.internal.R.string.webviewchromium_week_picker_dialog_title;
 
diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
new file mode 100644
index 0000000..b7eea18
--- /dev/null
+++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_date_time_suggestion.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Chromium Authors. All rights reserved.
+
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/webviewchromium_date_time_suggestion"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="44dp"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+    <TextView
+        android:id="@+id/webviewchromium_date_time_suggestion_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textSize="18sp" />
+    <TextView
+        android:id="@+id/webviewchromium_date_time_suggestion_label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
+        android:layout_weight="1"
+        android:textSize="18sp"
+        android:gravity="end"
+        android:textColor="#8b8b8b"
+        android:ellipsize="end"
+        android:singleLine="true" />
+</LinearLayout>
diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
index 8bfecdd..2bf853c 100644
--- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml
@@ -42,6 +42,7 @@
   <add-resource type="layout" name="webviewchromium_color_picker_dialog_content" />
   <add-resource type="layout" name="webviewchromium_color_picker_dialog_title" />
   <add-resource type="layout" name="webviewchromium_date_time_picker_dialog" />
+  <add-resource type="layout" name="webviewchromium_date_time_suggestion" />
   <add-resource type="layout" name="webviewchromium_multi_field_time_picker_dialog" />
   <add-resource type="layout" name="webviewchromium_two_field_date_picker" />
 
@@ -76,6 +77,7 @@
   <add-resource type="string" name="webviewchromium_color_picker_saturation" />
   <add-resource type="string" name="webviewchromium_color_picker_value" />
   <add-resource type="string" name="webviewchromium_date_picker_dialog_clear" />
+  <add-resource type="string" name="webviewchromium_date_picker_dialog_other_button_label" />
   <add-resource type="string" name="webviewchromium_date_picker_dialog_set" />
   <add-resource type="string" name="webviewchromium_date_picker_dialog_title" />
   <add-resource type="string" name="webviewchromium_date_time_picker_dialog_title" />
diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
index e61ff98..761e38e 100644
--- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml
@@ -45,6 +45,7 @@
   <java-symbol type="layout" name="webviewchromium_color_picker_dialog_content" />
   <java-symbol type="layout" name="webviewchromium_color_picker_dialog_title" />
   <java-symbol type="layout" name="webviewchromium_date_time_picker_dialog" />
+  <java-symbol type="layout" name="webviewchromium_date_time_suggestion" />
   <java-symbol type="layout" name="webviewchromium_two_field_date_picker" />
   <java-symbol type="layout" name="webviewchromium_multi_field_time_picker_dialog" />
 
@@ -84,6 +85,7 @@
   <java-symbol type="string" name="webviewchromium_date_picker_dialog_clear" />
   <java-symbol type="string" name="webviewchromium_date_picker_dialog_set" />
   <java-symbol type="string" name="webviewchromium_date_picker_dialog_title" />
+  <java-symbol type="string" name="webviewchromium_date_picker_dialog_other_button_label" />
   <java-symbol type="string" name="webviewchromium_date_time_picker_dialog_title" />
   <java-symbol type="string" name="webviewchromium_copy_to_clipboard_failure_message" />
   <java-symbol type="string" name="webviewchromium_low_memory_error" />
@@ -122,6 +124,8 @@
   <java-symbol type="id" name="webviewchromium_color_picker_title" />
   <java-symbol type="id" name="webviewchromium_ampm" />
   <java-symbol type="id" name="webviewchromium_date_picker" />
+  <java-symbol type="id" name="webviewchromium_date_time_suggestion_value" />
+  <java-symbol type="id" name="webviewchromium_date_time_suggestion_label" />
   <java-symbol type="id" name="webviewchromium_hour" />
   <java-symbol type="id" name="webviewchromium_milli" />
   <java-symbol type="id" name="webviewchromium_minute" />
diff --git a/chromium/overlay/frameworks/base/core/res/res/values/strings.xml b/chromium/overlay/frameworks/base/core/res/res/values/strings.xml
index 13a3be8..a87250d 100644
--- a/chromium/overlay/frameworks/base/core/res/res/values/strings.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/values/strings.xml
@@ -17,12 +17,14 @@
     <string name="webviewchromium_accessibility_content_view">Web View</string>
 
     <!-- Date/time picker dialog strings -->
+    <!-- Title for the date picker dialog, which can be used to choose a date. [CHAR-LIMIT=32] -->
+    <string name="webviewchromium_date_picker_dialog_title">Set date</string>
     <!-- Label for 'set' button in date picker dialog, used to replace the contents of a field with the chosen date [CHAR-LIMIT=12] -->
     <string name="webviewchromium_date_picker_dialog_set">Set</string>
     <!-- Label for 'clear' button in date picker dialog, used to replace the contents of a field with the empty string [CHAR-LIMIT=12] -->
     <string name="webviewchromium_date_picker_dialog_clear">Clear</string>
-    <!-- Title for the date picker dialog, which can be used to choose a date. [CHAR-LIMIT=32] -->
-    <string name="webviewchromium_date_picker_dialog_title">Set date</string>
+    <!-- Label for 'other' button in date picker dialog and time picker dialog, used to close the list of suggestions and open the the full date/time picker [CHAR-LIMIT=32] -->
+    <string name="webviewchromium_date_picker_dialog_other_button_label">Other</string>
     <!-- Title for the date/time picker dialog, which can be used to choose a date and time. [CHAR-LIMIT=32] -->
     <string name="webviewchromium_date_time_picker_dialog_title">Set date and time</string>
     <!-- Title for the time picker dialog, which can be used to choose a time.  [CHAR-LIMIT=32] -->