diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:48 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:48 +0000 |
commit | 0b29910a7d689f3456eeb880f163b189f6b57aeb (patch) | |
tree | b479deea54032052b2959db26092bd76efe2d4db | |
parent | 664f87414423ea78ef543ee8da168d32fc8f0f94 (diff) | |
parent | 7cc5af6a8cbf8dd6a7820227c79cb714e04e802f (diff) | |
download | android_frameworks_webview-0b29910a7d689f3456eeb880f163b189f6b57aeb.tar.gz android_frameworks_webview-0b29910a7d689f3456eeb880f163b189f6b57aeb.tar.bz2 android_frameworks_webview-0b29910a7d689f3456eeb880f163b189f6b57aeb.zip |
Merge master-chromium into master at r240154
This commit was generated by merge_to_master.py.
Change-Id: Ia61470ff57c573bccec9f7c9043bab7ac8d41fa5
12 files changed, 201 insertions, 35 deletions
diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java index 240e4d6..e944710 100644 --- a/chromium/java/com/android/webview/chromium/ResourceProvider.java +++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java @@ -56,11 +56,15 @@ public class ResourceProvider { com.android.internal.R.dimen.webviewchromium_autofill_text_height; org.chromium.ui.R.dimen.autofill_text_divider_height = com.android.internal.R.dimen.webviewchromium_autofill_text_divider_height; + org.chromium.ui.R.dimen.color_button_height = + com.android.internal.R.dimen.webviewchromium_color_button_height; // drawable org.chromium.content.R.drawable.ondemand_overlay = com.android.internal.R.drawable.webviewchromium_ondemand_overlay; + org.chromium.ui.R.drawable.color_button_background = + com.android.internal.R.drawable.webviewchromium_color_button_background; org.chromium.ui.R.drawable.color_picker_advanced_select_handle = com.android.internal.R.drawable.webviewchromium_color_picker_advanced_select_handle; @@ -69,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; @@ -106,10 +114,10 @@ public class ResourceProvider { com.android.internal.R.id.webviewchromium_color_picker_advanced; org.chromium.ui.R.id.color_picker_simple = com.android.internal.R.id.webviewchromium_color_picker_simple; + org.chromium.ui.R.id.color_button_swatch = + com.android.internal.R.id.webviewchromium_color_button_swatch; org.chromium.ui.R.id.more_colors_button_border = com.android.internal.R.id.webviewchromium_color_picker_more_colors_button_border; - org.chromium.ui.R.id.color_picker_simple_border = - com.android.internal.R.id.webviewchromium_color_picker_simple_border; org.chromium.ui.R.id.gradient = com.android.internal.R.id.webviewchromium_color_picker_gradient; org.chromium.ui.R.id.text = @@ -127,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 = @@ -169,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 = @@ -195,9 +207,13 @@ 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; + org.chromium.ui.R.string.copy_to_clipboard_failure_message = + com.android.internal.R.string.webviewchromium_copy_to_clipboard_failure_message; org.chromium.ui.R.string.low_memory_error = com.android.internal.R.string.webviewchromium_low_memory_error; org.chromium.ui.R.string.opening_file_error = @@ -216,6 +232,23 @@ public class ResourceProvider { com.android.internal.R.string.webviewchromium_color_picker_button_cancel; org.chromium.ui.R.string.color_picker_dialog_title = com.android.internal.R.string.webviewchromium_color_picker_dialog_title; + org.chromium.ui.R.string.color_picker_button_red = + com.android.internal.R.string.webviewchromium_color_picker_button_red; + org.chromium.ui.R.string.color_picker_button_cyan = + com.android.internal.R.string.webviewchromium_color_picker_button_cyan; + org.chromium.ui.R.string.color_picker_button_blue = + com.android.internal.R.string.webviewchromium_color_picker_button_blue; + org.chromium.ui.R.string.color_picker_button_green = + com.android.internal.R.string.webviewchromium_color_picker_button_green; + org.chromium.ui.R.string.color_picker_button_magenta = + com.android.internal.R.string.webviewchromium_color_picker_button_magenta; + org.chromium.ui.R.string.color_picker_button_yellow = + com.android.internal.R.string.webviewchromium_color_picker_button_yellow; + org.chromium.ui.R.string.color_picker_button_black = + com.android.internal.R.string.webviewchromium_color_picker_button_black; + org.chromium.ui.R.string.color_picker_button_white = + com.android.internal.R.string.webviewchromium_color_picker_button_white; + // style org.chromium.content.R.style.SelectPopupDialog = diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index 0f062ac..1f4286f 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -59,6 +59,7 @@ import org.chromium.android_webview.AwBrowserContext; import org.chromium.android_webview.AwContents; import org.chromium.android_webview.AwLayoutSizer; import org.chromium.android_webview.AwSettings; +import org.chromium.android_webview.AwPrintDocumentAdapter; import org.chromium.base.ThreadUtils; import org.chromium.content.browser.LoadUrlParams; import org.chromium.net.NetworkChangeNotifier; @@ -834,13 +835,6 @@ class WebViewChromium implements WebViewProvider, } @Override - public PrintDocumentAdapter createPrintDocumentAdapter() { - checkThread(); - // TODO(sgurun) fix this after upstream part lands - return null; - } - - @Override public float getScale() { // No checkThread() as it is mostly thread safe (workaround for b/10652991). mFactory.startYourEngines(true); @@ -2033,6 +2027,12 @@ class WebViewChromium implements WebViewProvider, mAwContents.computeScroll(); } + @Override + public PrintDocumentAdapter createPrintDocumentAdapter() { + checkThread(); + return new AwPrintDocumentAdapter(mAwContents.getPdfExporter()); + } + // AwContents.InternalAccessDelegate implementation -------------------------------------- private class InternalAccessAdapter implements AwContents.InternalAccessDelegate { @Override diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 7ccdee3..b823543 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -46,6 +46,7 @@ import org.chromium.base.CommandLine; import org.chromium.base.MemoryPressureListener; import org.chromium.base.PathService; import org.chromium.base.ThreadUtils; +import org.chromium.content.app.ContentMain; import org.chromium.content.app.LibraryLoader; import org.chromium.content.browser.ContentViewStatics; import org.chromium.content.browser.ResourceExtractor; @@ -315,7 +316,13 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { public CookieManager getCookieManager() { synchronized (mLock) { if (mCookieManager == null) { - ensureChromiumStartedLocked(true); + if (!mStarted) { + // We can use CookieManager without starting Chromium; the native code + // will bring up just the parts it needs to make this work on a temporary + // basis until Chromium is started for real. The temporary cookie manager + // needs the application context to have been set. + ContentMain.initApplicationContext(ActivityThread.currentApplication()); + } mCookieManager = new CookieManagerAdapter(new AwCookieManager()); } } diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml new file mode 100644 index 0000000..7bb2679 --- /dev/null +++ b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_button_background.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:top="0dp" + android:right="0dp" + android:bottom="0dp" + android:left="0dp"> + <shape android:shape="rectangle"> + <solid android:color="@color/webviewchromium_color_picker_border_color"/> + </shape> + </item> + <item android:top="0px" + android:right="1px" + android:bottom="0px" + android:left="1px"> + <shape android:shape="rectangle"> + <solid android:color="@color/webviewchromium_color_picker_background_color"/> + </shape> + </item> + <item + android:id="@+id/webviewchromium_color_button_swatch" + android:top="1px" + android:right="2px" + android:bottom="1px" + android:left="2px"> + <shape android:shape="rectangle"> + <solid android:color="#FF0000"/> + </shape> + </item> +</layer-list> diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml index 6b39744..cfcb39f 100644 --- a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml +++ b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_color_picker_border.xml @@ -5,6 +5,6 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#00000000"/> + <solid android:color="@color/webviewchromium_color_picker_background_color"/> <stroke android:width="1px" android:color="@color/webviewchromium_color_picker_border_color" /> </shape> diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml index 5de9f1f..42d8af4 100644 --- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml +++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml @@ -4,48 +4,48 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" android:padding="15dp"> - <com.android.org.chromium.ui.ColorPickerAdvanced - android:id="@+id/webviewchromium_color_picker_advanced" + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/webviewchromium_color_picker_simple_border" + <com.android.org.chromium.ui.ColorPickerAdvanced + android:id="@+id/webviewchromium_color_picker_advanced" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </ScrollView> + + <com.android.org.chromium.ui.ColorPickerSimple + android:id="@+id/webviewchromium_color_picker_simple" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/webviewchromium_color_picker_border" + android:divider="@color/webviewchromium_color_picker_border_color" + android:dividerHeight="1px" android:paddingStart="1px" android:paddingEnd="1px" - android:paddingTop="1px"> - - - <com.android.org.chromium.ui.ColorPickerSimple - android:id="@+id/webviewchromium_color_picker_simple" - android:layout_width="match_parent" - android:layout_height="100dp"/> - </FrameLayout> + android:paddingTop="1px" + android:background="@drawable/webviewchromium_color_picker_border" /> <FrameLayout android:id="@+id/webviewchromium_color_picker_more_colors_button_border" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/webviewchromium_color_picker_simple_border" android:background="@drawable/webviewchromium_color_picker_border" android:padding="1px"> - <Button + <com.android.org.chromium.ui.ColorPickerMoreButton android:id="@+id/webviewchromium_color_picker_more_colors_button" style="?android:attr/buttonBarButtonStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="60dip" + android:minHeight="48dp" + android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/webviewchromium_color_picker_button_more" /> </FrameLayout> - -</RelativeLayout> +</LinearLayout> 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 a947ba2..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 @@ -23,14 +23,17 @@ <add-resource type="color" name="webviewchromium_autofill_dark_divider_color" /> <add-resource type="color" name="webviewchromium_autofill_divider_color" /> + <add-resource type="color" name="webviewchromium_color_picker_background_color" /> <add-resource type="color" name="webviewchromium_color_picker_border_color" /> + <add-resource type="dimen" name="webviewchromium_color_button_height" /> <add-resource type="dimen" name="webviewchromium_color_picker_gradient_margin" /> <add-resource type="dimen" name="webviewchromium_autofill_text_height" /> <add-resource type="dimen" name="webviewchromium_autofill_text_divider_height" /> <add-resource type="dimen" name="webviewchromium_link_preview_overlay_radius" /> <add-resource type="drawable" name="webviewchromium_color_advanced_select_handle" /> + <add-resource type="drawable" name="webviewchromium_color_button_background" /> <add-resource type="drawable" name="webviewchromium_color_picker_border" /> <add-resource type="drawable" name="webviewchromium_ondemand_overlay" /> @@ -39,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" /> @@ -61,13 +65,23 @@ <add-resource type="string" name="webviewchromium_color_picker_button_more" /> <add-resource type="string" name="webviewchromium_color_picker_button_set" /> <add-resource type="string" name="webviewchromium_color_picker_dialog_title" /> + <add-resource type="string" name="webviewchromium_color_picker_button_red" /> + <add-resource type="string" name="webviewchromium_color_picker_button_cyan" /> + <add-resource type="string" name="webviewchromium_color_picker_button_blue" /> + <add-resource type="string" name="webviewchromium_color_picker_button_green" /> + <add-resource type="string" name="webviewchromium_color_picker_button_magenta" /> + <add-resource type="string" name="webviewchromium_color_picker_button_yellow" /> + <add-resource type="string" name="webviewchromium_color_picker_button_black" /> + <add-resource type="string" name="webviewchromium_color_picker_button_white" /> <add-resource type="string" name="webviewchromium_color_picker_hue" /> <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" /> + <add-resource type="string" name="webviewchromium_copy_to_clipboard_failure_message" /> <add-resource type="string" name="webviewchromium_low_memory_error" /> <add-resource type="string" name="webviewchromium_media_player_error_button" /> <add-resource type="string" name="webviewchromium_media_player_error_text_invalid_progressive_playback" /> 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 0a0f602..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 @@ -26,13 +26,16 @@ <java-symbol type="color" name="webviewchromium_autofill_dark_divider_color" /> <java-symbol type="color" name="webviewchromium_autofill_divider_color" /> + <java-symbol type="color" name="webviewchromium_color_picker_background_color" /> <java-symbol type="color" name="webviewchromium_color_picker_border_color" /> + <java-symbol type="dimen" name="webviewchromium_color_button_height" /> <java-symbol type="dimen" name="webviewchromium_color_picker_gradient_margin" /> <java-symbol type="dimen" name="webviewchromium_autofill_text_height" /> <java-symbol type="dimen" name="webviewchromium_autofill_text_divider_height" /> <java-symbol type="dimen" name="webviewchromium_link_preview_overlay_radius" /> + <java-symbol type="drawable" name="webviewchromium_color_button_background" /> <java-symbol type="drawable" name="webviewchromium_color_picker_advanced_select_handle" /> <java-symbol type="drawable" name="webviewchromium_color_picker_border" /> <java-symbol type="drawable" name="webviewchromium_ondemand_overlay" /> @@ -42,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" /> @@ -65,13 +69,25 @@ <java-symbol type="string" name="webviewchromium_color_picker_button_more" /> <java-symbol type="string" name="webviewchromium_color_picker_button_set" /> <java-symbol type="string" name="webviewchromium_color_picker_dialog_title" /> + + <java-symbol type="string" name="webviewchromium_color_picker_button_red" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_cyan" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_blue" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_green" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_magenta" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_yellow" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_black" /> + <java-symbol type="string" name="webviewchromium_color_picker_button_white" /> + <java-symbol type="string" name="webviewchromium_color_picker_hue" /> <java-symbol type="string" name="webviewchromium_color_picker_saturation" /> <java-symbol type="string" name="webviewchromium_color_picker_value" /> <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" /> <java-symbol type="string" name="webviewchromium_media_player_error_button" /> <java-symbol type="string" name="webviewchromium_media_player_error_text_invalid_progressive_playback" /> @@ -96,6 +112,7 @@ <java-symbol type="id" name="webviewchromium_autofill_label" /> <java-symbol type="id" name="webviewchromium_autofill_popup_window" /> <java-symbol type="id" name="webviewchromium_autofill_sublabel" /> + <java-symbol type="id" name="webviewchromium_color_button_swatch" /> <java-symbol type="id" name="webviewchromium_color_picker_advanced" /> <java-symbol type="id" name="webviewchromium_color_picker_gradient" /> <java-symbol type="id" name="webviewchromium_color_picker_more_colors_button" /> @@ -103,11 +120,12 @@ <java-symbol type="id" name="webviewchromium_color_picker_seek_bar" /> <java-symbol type="id" name="webviewchromium_color_picker_selected_color_view" /> <java-symbol type="id" name="webviewchromium_color_picker_simple" /> - <java-symbol type="id" name="webviewchromium_color_picker_simple_border" /> <java-symbol type="id" name="webviewchromium_color_picker_text" /> <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/colors.xml b/chromium/overlay/frameworks/base/core/res/res/values/colors.xml index 6d43c93..de262ff 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/colors.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/colors.xml @@ -5,6 +5,7 @@ --> <resources> <color name="webviewchromium_color_picker_border_color">#B0B0B0</color> + <color name="webviewchromium_color_picker_background_color">#FFFFFF</color> <color name="webviewchromium_autofill_divider_color">#E5E5E5</color> <color name="webviewchromium_autofill_dark_divider_color">#C0C0C0</color> </resources> diff --git a/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml b/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml index b87f944..faeaba2 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -13,6 +13,7 @@ 14.5 = Seekbar thumb width - border width, but it depends on the width of the seek bar icon. --> + <dimen name="webviewchromium_color_button_height">60dp</dimen> <dimen name="webviewchromium_color_picker_gradient_margin">14.5dp</dimen> <dimen name="webviewchromium_autofill_text_height">44dp</dimen> <dimen name="webviewchromium_autofill_text_divider_height">1px</dimen> 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 27a9ac7..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] --> @@ -92,6 +94,25 @@ <string name="webviewchromium_color_picker_button_cancel">Cancel</string> <!-- Title of Color Picker dialog. [CHAR-LIMIT=20] --> <string name="webviewchromium_color_picker_dialog_title">Select color</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_red">Red</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_cyan">Cyan</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_blue">Blue</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_green">Green</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_magenta">Magenta</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_yellow">Yellow</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_black">Black</string> + <!-- Label for Color Picker color button. --> + <string name="webviewchromium_color_picker_button_white">White</string> + + <!-- Notification for when copying to the clipboard fails. [CHAR-LIMIT=64] --> + <string name="webviewchromium_copy_to_clipboard_failure_message">Failed to copy to the clipboard</string> <!-- Error shown when the browser is restarted due to low memory during a file picker operation. [CHAR-LIMIT=NONE] --> <string name="webviewchromium_low_memory_error">Unable to complete previous operation due to low memory</string> |