Revert "Wire up resources for the Form Validation message bubble."
This reverts commit 0820c3d292380d5f06017de0877706b4924f0c60.
Change-Id: I95f17cb99d2e565a416d3e918d6d7ade6c0d9589
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 @@
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 @@
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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble.9.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/bubble_arrow_up.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/pageinfo_warning_major.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble.9.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/bubble_arrow_up.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/pageinfo_warning_major.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png
+++ /dev/null
Binary files 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
--- a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png
+++ /dev/null
Binary files 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 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/webviewchromium_bubble">
-
- <LinearLayout
- android:id="@+id/webviewchromium_validation_bubble_top_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignStart="@+id/webviewchromium_validation_bubble_icon_view"
- android:layout_alignEnd="@+id/webviewchromium_validation_bubble_text_wrapper"
- android:weightSum="1">
-
- <View
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="0.25"
- android:visibility="invisible"/>
-
- <ImageView
- android:id="@+id/webviewchromium_validation_bubble_arrow_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_marginBottom="7dp"
- android:src="@drawable/webviewchromium_bubble_arrow_up" />
-
- </LinearLayout>
-
- <ImageView
- android:id="@id/webviewchromium_validation_bubble_icon_view"
- android:layout_width="19dp"
- android:layout_height="19dp"
- android:layout_alignParentStart="true"
- android:layout_below="@id/webviewchromium_validation_bubble_top_view"
- android:layout_marginEnd="8dp"
- android:src="@drawable/webviewchromium_pageinfo_warning_major" />
-
- <LinearLayout
- android:id="@id/webviewchromium_validation_bubble_text_wrapper"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/webviewchromium_validation_bubble_top_view"
- android:layout_toEndOf="@id/webviewchromium_validation_bubble_icon_view"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/webviewchromium_validation_bubble_main_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxWidth="300dp"
- android:textColor="@android:color/black"
- android:textSize="16sp" />
-
- <TextView
- android:id="@+id/webviewchromium_validation_bubble_sub_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxWidth="300dp"
- android:textColor="#444"
- android:textSize="13sp" />
-
- </LinearLayout>
-
-</RelativeLayout>
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 @@
<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" />
- <add-resource type="drawable" name="webviewchromium_bubble" />
- <add-resource type="drawable" name="webviewchromium_bubble_arrow_up" />
- <add-resource type="drawable" name="webviewchromium_pageinfo_warning_major" />
<add-resource type="layout" name="webviewchromium_autofill_text" />
<add-resource type="layout" name="webviewchromium_color_picker_advanced_component" />
@@ -48,12 +45,8 @@
<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" />
- <add-resource type="layout" name="webviewchromium_validation_message_bubble" />
<add-resource type="id" name="webviewchromium_autofill_popup_window" />
- <add-resource type="id" name="webviewchromium_validation_bubble_main_text" />
- <add-resource type="id" name="webviewchromium_validation_bubble_sub_text" />
- <add-resource type="id" name="webviewchromium_validation_bubble_arrow_image" />
<add-resource type="string" name="webviewchromium_accessibility_content_view" />
<add-resource type="string" name="webviewchromium_accessibility_date_picker_month" />
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 @@
<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" />
- <java-symbol type="drawable" name="webviewchromium_bubble" />
- <java-symbol type="drawable" name="webviewchromium_bubble_arrow_up" />
- <java-symbol type="drawable" name="webviewchromium_pageinfo_warning_major" />
<java-symbol type="layout" name="webviewchromium_autofill_text" />
<java-symbol type="layout" name="webviewchromium_color_picker_advanced_component" />
@@ -51,7 +48,6 @@
<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" />
- <java-symbol type="layout" name="webviewchromium_validation_message_bubble" />
<java-symbol type="menu" name="webviewchromium_select_action_menu" />
@@ -146,9 +142,6 @@
<java-symbol type="id" name="webviewchromium_select_action_menu_web_search" />
<java-symbol type="id" name="webviewchromium_time_picker" />
<java-symbol type="id" name="webviewchromium_year" />
- <java-symbol type="id" name="webviewchromium_validation_bubble_main_text" />
- <java-symbol type="id" name="webviewchromium_validation_bubble_sub_text" />
- <java-symbol type="id" name="webviewchromium_validation_bubble_arrow_image" />
<java-symbol type="style" name="webviewchromium_AutofillPopupWindow" />
<java-symbol type="style" name="webviewchromium_SelectPopupDialog" />
