From bd7f8ebeca2bb9dcba2dc453667b40d034619c7f Mon Sep 17 00:00:00 2001
From: Marcin Kosiba <mkosiba@google.com>
Date: Mon, 3 Mar 2014 14:23:26 +0000
Subject: Update resources to match upstream.

This updates resources to match the upstream M33 release branch
at r254123.

BUG: 11964789
Change-Id: I0561b916b242d310d291d8c403bb04f415492889
---
 .../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
 .../res/drawable-hdpi/webviewchromium_bubble.9.png | Bin 0 -> 884 bytes
 .../webviewchromium_bubble_arrow_up.png            | Bin 0 -> 396 bytes
 .../webviewchromium_ondemand_overlay.9.png         | Bin 0 -> 4965 bytes
 .../webviewchromium_pageinfo_warning_major.png     | Bin 0 -> 1518 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
 .../drawable-xhdpi/webviewchromium_bubble.9.png    | Bin 0 -> 1174 bytes
 .../webviewchromium_bubble_arrow_up.png            | Bin 0 -> 459 bytes
 .../webviewchromium_ondemand_overlay.9.png         | Bin 0 -> 6340 bytes
 .../webviewchromium_pageinfo_warning_major.png     | Bin 0 -> 1991 bytes
 ...ewchromium_autofill_popup_background_down.9.png | Bin 335 -> 289 bytes
 ...viewchromium_autofill_popup_background_up.9.png | Bin 326 -> 288 bytes
 .../res/res/drawable/webviewchromium_bubble.9.png  | Bin 501 -> 482 bytes
 .../drawable/webviewchromium_bubble_arrow_up.png   | Bin 214 -> 172 bytes
 .../webviewchromium_ondemand_overlay.9.png         | Bin 7648 -> 3097 bytes
 .../webviewchromium_pageinfo_warning_major.png     | Bin 983 -> 1009 bytes
 .../webviewchromium_color_picker_dialog_title.xml  |   7 +++--
 ...viewchromium_multi_field_time_picker_dialog.xml |  34 ++++++++++-----------
 .../webviewchromium_two_field_date_picker.xml      |  12 ++++----
 23 files changed, 27 insertions(+), 26 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
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble.9.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_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
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble.9.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
 create mode 100644 chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png

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-hdpi/webviewchromium_bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_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/webviewchromium_bubble.9.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_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/webviewchromium_bubble_arrow_up.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png
new file mode 100644
index 0000000..bf355b1
Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_ondemand_overlay.9.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-hdpi/webviewchromium_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/webviewchromium_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
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-xhdpi/webviewchromium_bubble.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_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/webviewchromium_bubble.9.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_bubble_arrow_up.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_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/webviewchromium_bubble_arrow_up.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png
new file mode 100644
index 0000000..808b5aa
Binary files /dev/null and b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_ondemand_overlay.9.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable-xhdpi/webviewchromium_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/webviewchromium_pageinfo_warning_major.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png
index 2022fd7..0fb3b87 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_down.9.png differ
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png
index 62fc5a6..4ab1786 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.png and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_autofill_popup_background_up.9.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
index 40588d2..f3089cc 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble.9.png 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
index e1cbfa2..75d8e79 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_bubble_arrow_up.png 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_ondemand_overlay.9.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png
index 75507e2..dec3281 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.png and b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_ondemand_overlay.9.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
index 26445cb..82c9635 100644
Binary files a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png 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_color_picker_dialog_title.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
index 83b87fa..a2369fe 100644
--- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_title.xml
@@ -19,6 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/webviewchromium_color_picker_selected_color_view_border"
         android:layout_centerVertical="true"
+        android:textColor="#33B5E5"
         android:ellipsize="end"
         android:singleLine="true" />
 
@@ -26,9 +27,9 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_alignParentEnd="true"
-        android:id="@+id/selected_color_view_border"
+        android:id="@+id/webviewchromium_color_picker_selected_color_view_border"
         android:background="@drawable/webviewchromium_color_picker_border"
-        android:padding="1dp">
+        android:padding="2px">
 
         <View
             android:id="@+id/webviewchromium_color_picker_selected_color_view"
@@ -37,4 +38,4 @@
             android:background="@android:color/black" />
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
index 3a11449..2bf7e24 100644
--- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_multi_field_time_picker_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 The Chromium Authors. All rights reserved.
+<!-- 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.
@@ -26,7 +26,7 @@
     />
 
     <View
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="2dp"
         android:paddingBottom="5dp"
         android:paddingTop="5dp"
@@ -41,12 +41,12 @@
 
         <NumberPicker
             android:id="@+id/webviewchromium_hour"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight=".2"
             android:textSize="12sp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dip"
-            android:layout_marginEnd="4dip"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_time_picker_hour"
@@ -59,12 +59,12 @@
             />
         <NumberPicker
             android:id="@+id/webviewchromium_minute"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight=".2"
             android:textSize="12sp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dip"
-            android:layout_marginEnd="4dip"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_time_picker_minute"
@@ -78,12 +78,12 @@
             />
         <NumberPicker
             android:id="@+id/webviewchromium_second"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight=".2"
             android:textSize="12sp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dip"
-            android:layout_marginEnd="4dip"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_time_picker_second"
@@ -97,24 +97,24 @@
             />
         <NumberPicker
             android:id="@+id/webviewchromium_milli"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight=".2"
             android:textSize="12sp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dip"
-            android:layout_marginEnd="4dip"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_time_picker_milli"
             />
         <NumberPicker
             android:id="@+id/webviewchromium_ampm"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight=".2"
             android:textSize="12sp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dip"
-            android:layout_marginEnd="4dip"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_time_picker_ampm"
diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
index fffe6b6..cd9fac9 100644
--- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_two_field_date_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
+<!-- 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.
@@ -19,13 +19,13 @@
         android:orientation="horizontal"
         android:gravity="center">
 
-        <!-- Month -->
+        <!-- Position in year -->
         <NumberPicker
             android:id="@+id/webviewchromium_position_in_year"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_date_picker_month"
@@ -36,8 +36,8 @@
             android:id="@+id/webviewchromium_year"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:contentDescription="@string/webviewchromium_accessibility_date_picker_year"
-- 
cgit v1.2.3