summaryrefslogtreecommitdiffstats
path: root/components/web_contents_delegate_android
diff options
context:
space:
mode:
authortkent <tkent@chromium.org>2015-03-01 19:05:46 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-02 03:07:11 +0000
commit6a885cd9038c536a3c7c13f0ca99eb8e59dcc75e (patch)
tree92fa053d3d8257db42872bacb5c521f4d89db87d /components/web_contents_delegate_android
parent378e940e74d07896695b6bd1582de760bab7c3b1 (diff)
downloadchromium_src-6a885cd9038c536a3c7c13f0ca99eb8e59dcc75e.zip
chromium_src-6a885cd9038c536a3c7c13f0ca99eb8e59dcc75e.tar.gz
chromium_src-6a885cd9038c536a3c7c13f0ca99eb8e59dcc75e.tar.bz2
Android: Move resources for validation message bubble to components/web_contents_delegate_android/.
These resources are used only by web_contents_delegate_android. BUG=458328 Review URL: https://codereview.chromium.org/950223002 Cr-Commit-Position: refs/heads/master@{#318637}
Diffstat (limited to 'components/web_contents_delegate_android')
-rw-r--r--components/web_contents_delegate_android/BUILD.gn7
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.pngbin0 -> 584 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.pngbin0 -> 263 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.pngbin0 -> 166 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble.9.pngbin0 -> 264 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble_arrow_up.pngbin0 -> 100 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-mdpi/ic_warning.pngbin0 -> 173 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble.9.pngbin0 -> 747 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble_arrow_up.pngbin0 -> 313 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/drawable-xhdpi/ic_warning.pngbin0 -> 202 bytes
-rw-r--r--components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml72
-rw-r--r--components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java1
12 files changed, 79 insertions, 1 deletions
diff --git a/components/web_contents_delegate_android/BUILD.gn b/components/web_contents_delegate_android/BUILD.gn
index ff51669..56ee8de 100644
--- a/components/web_contents_delegate_android/BUILD.gn
+++ b/components/web_contents_delegate_android/BUILD.gn
@@ -32,8 +32,15 @@ static_library("web_contents_delegate_android") {
}
# GYP: //components/web_contents_delegate_android:web_contents_delegate_android_java
+android_resources("web_contents_delegate_android_java_resources") {
+ custom_package = "org.chromium.components.web_contents_delegate_android"
+ resource_dirs = [ "android/java/res" ]
+}
+
+# GYP: //components/web_contents_delegate_android:web_contents_delegate_android_java
android_library("web_contents_delegate_android_java") {
deps = [
+ ":web_contents_delegate_android_java_resources",
"//base:base_java",
"//ui/android:ui_java",
"//content/public/android:content_java",
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.png b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.png
new file mode 100644
index 0000000..d10f9c4
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.png b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.png
new file mode 100644
index 0000000..b7f8013
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.png b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.png
new file mode 100644
index 0000000..4214af1
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble.9.png b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble.9.png
new file mode 100644
index 0000000..44699de
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble.9.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble_arrow_up.png b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble_arrow_up.png
new file mode 100644
index 0000000..df407ef
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/bubble_arrow_up.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-mdpi/ic_warning.png b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/ic_warning.png
new file mode 100644
index 0000000..c5f4880
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/ic_warning.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble.9.png b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble.9.png
new file mode 100644
index 0000000..67492c1
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble.9.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble_arrow_up.png b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble_arrow_up.png
new file mode 100644
index 0000000..dd7b403
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/bubble_arrow_up.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/ic_warning.png b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/ic_warning.png
new file mode 100644
index 0000000..7431334
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/ic_warning.png
Binary files differ
diff --git a/components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml b/components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml
new file mode 100644
index 0000000..5277e80
--- /dev/null
+++ b/components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml
@@ -0,0 +1,72 @@
+<?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/bubble">
+
+ <LinearLayout
+ android:id="@+id/top_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/icon_view"
+ android:layout_alignEnd="@+id/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/arrow_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="7dp"
+ android:src="@drawable/bubble_arrow_up"
+ android:contentDescription="@null" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@id/icon_view"
+ android:layout_width="19dp"
+ android:layout_height="19dp"
+ android:layout_alignParentStart="true"
+ android:layout_below="@id/top_view"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_warning"
+ android:contentDescription="@null" />
+
+ <LinearLayout
+ android:id="@id/text_wrapper"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/top_view"
+ android:layout_toEndOf="@id/icon_view"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/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/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/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java
index 035f4f9..9b6d7a3 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java
@@ -16,7 +16,6 @@ import android.widget.TextView;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.CalledByNative;
-import org.chromium.content.R;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.RenderCoordinates;