From 1dcc873fead7198083da19ea33734ad4d92a496a Mon Sep 17 00:00:00 2001 From: Martin Kosiba Date: Thu, 12 Dec 2013 17:30:19 +0000 Subject: Revert "Adding a fake on page started for data url's since we know it wont be sent" This reverts commit f401798d628ddb492defeb0a00bf289284d1677a. This code was moved upstream: http://crrev.com/110573003 BUG=10570052 --- .../java/com/android/webview/chromium/WebViewChromium.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index 6c5ee7a..43efb14 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -597,16 +597,6 @@ class WebViewChromium implements WebViewProvider, } } loadUrlOnUiThread(loadUrlParams); - - // Data url's with a base url will be resolved in Blink, and not cause an onPageStarted - // event to be sent. Sending the callback directly from here. - final String finalBaseUrl = loadUrlParams.getBaseUrl(); - ThreadUtils.postOnUiThread(new Runnable() { - @Override - public void run() { - mContentsClientAdapter.onPageStarted(finalBaseUrl); - } - }); } private void loadUrlOnUiThread(final LoadUrlParams loadUrlParams) { -- cgit v1.2.3 From 0820c3d292380d5f06017de0877706b4924f0c60 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 Sep 2013 11:32:16 -0700 Subject: Wire up resources for the Form Validation message bubble. Bug: 11481260 Change-Id: If8782f7a00904ceea7bad61e5296e12e23315001 --- .../android/webview/chromium/ResourceProvider.java | 8 +++ .../base/core/res/res/drawable-hdpi/bubble.9.png | Bin 0 -> 884 bytes .../core/res/res/drawable-hdpi/bubble_arrow_up.png | Bin 0 -> 396 bytes .../res/drawable-hdpi/pageinfo_warning_major.png | Bin 0 -> 1518 bytes .../base/core/res/res/drawable-xhdpi/bubble.9.png | Bin 0 -> 1174 bytes .../res/res/drawable-xhdpi/bubble_arrow_up.png | Bin 0 -> 459 bytes .../res/drawable-xhdpi/pageinfo_warning_major.png | Bin 0 -> 1991 bytes .../res/res/drawable/webviewchromium_bubble.9.png | Bin 0 -> 501 bytes .../drawable/webviewchromium_bubble_arrow_up.png | Bin 0 -> 214 bytes .../webviewchromium_pageinfo_warning_major.png | Bin 0 -> 983 bytes .../webviewchromium_validation_message_bubble.xml | 71 +++++++++++++++++++++ .../core/res/res/values/chromium-resources.xml | 7 ++ .../base/core/res/res/values/chromium-symbols.xml | 7 ++ 13 files changed, 93 insertions(+) create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java index e944710..7deed3d 100644 --- a/chromium/java/com/android/webview/chromium/ResourceProvider.java +++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java @@ -103,6 +103,12 @@ public class ResourceProvider { org.chromium.content.R.id.time_picker = com.android.internal.R.id.webviewchromium_time_picker; org.chromium.content.R.id.year = com.android.internal.R.id.webviewchromium_year; + org.chromium.content.R.id.main_text = + com.android.internal.R.id.webviewchromium_validation_bubble_main_text; + org.chromium.content.R.id.sub_text = + com.android.internal.R.id.webviewchromium_validation_bubble_sub_text; + org.chromium.content.R.id.arrow_image = + com.android.internal.R.id.webviewchromium_validation_bubble_arrow_image; org.chromium.ui.R.id.selected_color_view = com.android.internal.R.id.webviewchromium_color_picker_selected_color_view; @@ -141,6 +147,8 @@ public class ResourceProvider { com.android.internal.R.layout.webviewchromium_two_field_date_picker; org.chromium.content.R.layout.multi_field_time_picker_dialog = com.android.internal.R.layout.webviewchromium_multi_field_time_picker_dialog; + org.chromium.content.R.layout.validation_message_bubble = + com.android.internal.R.layout.webviewchromium_validation_message_bubble; org.chromium.ui.R.layout.color_picker_dialog_title = com.android.internal.R.layout.webviewchromium_color_picker_dialog_title; diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png new file mode 100644 index 0000000..905730f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png new file mode 100644 index 0000000..9f941a4 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png new file mode 100644 index 0000000..081668f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png new file mode 100644 index 0000000..c5d2e8f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png new file mode 100644 index 0000000..0ec744c Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png new file mode 100644 index 0000000..9b9e312 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png new file mode 100644 index 0000000..40588d2 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png new file mode 100644 index 0000000..e1cbfa2 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png new file mode 100644 index 0000000..26445cb Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml new file mode 100644 index 0000000..8510108 --- /dev/null +++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 2bf853c..be88108 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 @@ -36,6 +36,9 @@ + + + @@ -45,8 +48,12 @@ + + + + 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 761e38e..fd6ddb3 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 @@ -39,6 +39,9 @@ + + + @@ -48,6 +51,7 @@ + @@ -142,6 +146,9 @@ + + + -- cgit v1.2.3 From 477b059d2035e22280f5ee2892d257b035cca32e Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 13 Dec 2013 09:19:09 +0000 Subject: Revert "Wire up resources for the Form Validation message bubble." This reverts commit 0820c3d292380d5f06017de0877706b4924f0c60. Change-Id: I95f17cb99d2e565a416d3e918d6d7ade6c0d9589 --- .../android/webview/chromium/ResourceProvider.java | 8 --- .../base/core/res/res/drawable-hdpi/bubble.9.png | Bin 884 -> 0 bytes .../core/res/res/drawable-hdpi/bubble_arrow_up.png | Bin 396 -> 0 bytes .../res/drawable-hdpi/pageinfo_warning_major.png | Bin 1518 -> 0 bytes .../base/core/res/res/drawable-xhdpi/bubble.9.png | Bin 1174 -> 0 bytes .../res/res/drawable-xhdpi/bubble_arrow_up.png | Bin 459 -> 0 bytes .../res/drawable-xhdpi/pageinfo_warning_major.png | Bin 1991 -> 0 bytes .../res/res/drawable/webviewchromium_bubble.9.png | Bin 501 -> 0 bytes .../drawable/webviewchromium_bubble_arrow_up.png | Bin 214 -> 0 bytes .../webviewchromium_pageinfo_warning_major.png | Bin 983 -> 0 bytes .../webviewchromium_validation_message_bubble.xml | 71 --------------------- .../core/res/res/values/chromium-resources.xml | 7 -- .../base/core/res/res/values/chromium-symbols.xml | 7 -- 13 files changed, 93 deletions(-) delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png delete mode 100644 chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java index 7deed3d..e944710 100644 --- a/chromium/java/com/android/webview/chromium/ResourceProvider.java +++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java @@ -103,12 +103,6 @@ public class ResourceProvider { org.chromium.content.R.id.time_picker = com.android.internal.R.id.webviewchromium_time_picker; org.chromium.content.R.id.year = com.android.internal.R.id.webviewchromium_year; - org.chromium.content.R.id.main_text = - com.android.internal.R.id.webviewchromium_validation_bubble_main_text; - org.chromium.content.R.id.sub_text = - com.android.internal.R.id.webviewchromium_validation_bubble_sub_text; - org.chromium.content.R.id.arrow_image = - com.android.internal.R.id.webviewchromium_validation_bubble_arrow_image; org.chromium.ui.R.id.selected_color_view = com.android.internal.R.id.webviewchromium_color_picker_selected_color_view; @@ -147,8 +141,6 @@ public class ResourceProvider { com.android.internal.R.layout.webviewchromium_two_field_date_picker; org.chromium.content.R.layout.multi_field_time_picker_dialog = com.android.internal.R.layout.webviewchromium_multi_field_time_picker_dialog; - org.chromium.content.R.layout.validation_message_bubble = - com.android.internal.R.layout.webviewchromium_validation_message_bubble; org.chromium.ui.R.layout.color_picker_dialog_title = com.android.internal.R.layout.webviewchromium_color_picker_dialog_title; diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png deleted file mode 100644 index 905730f..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png deleted file mode 100644 index 9f941a4..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png deleted file mode 100644 index 081668f..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png deleted file mode 100644 index c5d2e8f..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png deleted file mode 100644 index 0ec744c..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png deleted file mode 100644 index 9b9e312..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png deleted file mode 100644 index 40588d2..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png deleted file mode 100644 index e1cbfa2..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png deleted file mode 100644 index 26445cb..0000000 Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png and /dev/null differ diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml deleted file mode 100644 index 8510108..0000000 --- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 be88108..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 @@ -36,9 +36,6 @@ - - - @@ -48,12 +45,8 @@ - - - - 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 fd6ddb3..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 @@ -39,9 +39,6 @@ - - - @@ -51,7 +48,6 @@ - @@ -146,9 +142,6 @@ - - - -- cgit v1.2.3 From 6a6311f8331f8cd2b3f86e012e552ec10e9b8d0b Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 Dec 2013 10:16:22 +0000 Subject: Revert "Revert "Wire up resources for the Form Validation message bubble."" This reverts commit 477b059d2035e22280f5ee2892d257b035cca32e. Change-Id: I3cb22edb023bee31ebf66c166be9ca52eeb44420 --- .../android/webview/chromium/ResourceProvider.java | 8 +++ .../base/core/res/res/drawable-hdpi/bubble.9.png | Bin 0 -> 884 bytes .../core/res/res/drawable-hdpi/bubble_arrow_up.png | Bin 0 -> 396 bytes .../res/drawable-hdpi/pageinfo_warning_major.png | Bin 0 -> 1518 bytes .../base/core/res/res/drawable-xhdpi/bubble.9.png | Bin 0 -> 1174 bytes .../res/res/drawable-xhdpi/bubble_arrow_up.png | Bin 0 -> 459 bytes .../res/drawable-xhdpi/pageinfo_warning_major.png | Bin 0 -> 1991 bytes .../res/res/drawable/webviewchromium_bubble.9.png | Bin 0 -> 501 bytes .../drawable/webviewchromium_bubble_arrow_up.png | Bin 0 -> 214 bytes .../webviewchromium_pageinfo_warning_major.png | Bin 0 -> 983 bytes .../webviewchromium_validation_message_bubble.xml | 71 +++++++++++++++++++++ .../core/res/res/values/chromium-resources.xml | 7 ++ .../base/core/res/res/values/chromium-symbols.xml | 7 ++ 13 files changed, 93 insertions(+) create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png create mode 100644 chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java index e944710..7deed3d 100644 --- a/chromium/java/com/android/webview/chromium/ResourceProvider.java +++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java @@ -103,6 +103,12 @@ public class ResourceProvider { org.chromium.content.R.id.time_picker = com.android.internal.R.id.webviewchromium_time_picker; org.chromium.content.R.id.year = com.android.internal.R.id.webviewchromium_year; + org.chromium.content.R.id.main_text = + com.android.internal.R.id.webviewchromium_validation_bubble_main_text; + org.chromium.content.R.id.sub_text = + com.android.internal.R.id.webviewchromium_validation_bubble_sub_text; + org.chromium.content.R.id.arrow_image = + com.android.internal.R.id.webviewchromium_validation_bubble_arrow_image; org.chromium.ui.R.id.selected_color_view = com.android.internal.R.id.webviewchromium_color_picker_selected_color_view; @@ -141,6 +147,8 @@ public class ResourceProvider { com.android.internal.R.layout.webviewchromium_two_field_date_picker; org.chromium.content.R.layout.multi_field_time_picker_dialog = com.android.internal.R.layout.webviewchromium_multi_field_time_picker_dialog; + org.chromium.content.R.layout.validation_message_bubble = + com.android.internal.R.layout.webviewchromium_validation_message_bubble; org.chromium.ui.R.layout.color_picker_dialog_title = com.android.internal.R.layout.webviewchromium_color_picker_dialog_title; diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png new file mode 100644 index 0000000..905730f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png new file mode 100644 index 0000000..9f941a4 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png new file mode 100644 index 0000000..081668f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png new file mode 100644 index 0000000..c5d2e8f Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png new file mode 100644 index 0000000..0ec744c Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png new file mode 100644 index 0000000..9b9e312 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png new file mode 100644 index 0000000..40588d2 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png new file mode 100644 index 0000000..e1cbfa2 Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png new file mode 100644 index 0000000..26445cb Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png differ diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml new file mode 100644 index 0000000..8510108 --- /dev/null +++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_validation_message_bubble.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 2bf853c..be88108 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 @@ -36,6 +36,9 @@ + + + @@ -45,8 +48,12 @@ + + + + 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 761e38e..fd6ddb3 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 @@ -39,6 +39,9 @@ + + + @@ -48,6 +51,7 @@ + @@ -142,6 +146,9 @@ + + + -- cgit v1.2.3 From 6ce095b8635ab72aa2508a3f99dbbb85ec4ca152 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Fri, 13 Dec 2013 16:03:09 +0000 Subject: Add third_party/angle to merged project list. Chromium needs third_party/angle again. Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36 --- chromium/tools/merge_common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 82306c6..e0bda24 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -36,6 +36,7 @@ THIRD_PARTY_PROJECTS_WITH_FLAT_HISTORY = [ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'sdch/open-vcdiff', 'testing/gtest', + 'third_party/angle', 'third_party/angle_dx11', 'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille', 'third_party/freetype', -- cgit v1.2.3 From 4aab98dbcc33a94cc58b884ecc623e56d6b0e03a Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Mon, 16 Dec 2013 22:39:30 -0800 Subject: Do not merge third_party/angle_dx11 This is no longer needed and replaced by third_party/angle. Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc --- chromium/tools/merge_common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index e0bda24..c38df88 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -37,7 +37,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'sdch/open-vcdiff', 'testing/gtest', 'third_party/angle', - 'third_party/angle_dx11', 'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille', 'third_party/freetype', 'third_party/icu', -- cgit v1.2.3