Merge "[WebView Support Library] Support incompatible WebView APKs." into pi-androidx-dev
diff --git a/car/res/values-h1752dp/dimens.xml b/car/res/values-h1752dp/dimens.xml
index ea5ebd6..8b83972 100644
--- a/car/res/values-h1752dp/dimens.xml
+++ b/car/res/values-h1752dp/dimens.xml
@@ -23,18 +23,25 @@
<dimen name="car_body2_size">32sp</dimen>
<dimen name="car_label1_size">32sp</dimen>
<dimen name="car_action1_size">32sp</dimen>
+ <dimen name="car_action2_size">32sp</dimen>
+
+ <!-- Navigation Bar -->
+ <dimen name="car_navigation_bar_height">128dp</dimen>
<!-- Icons and Buttons -->
<!-- Icons -->
<dimen name="car_primary_icon_size">56dp</dimen>
<dimen name="car_secondary_icon_size">36dp</dimen>
- <!-- Avatars -->
- <dimen name="car_avatar_size">96dp</dimen>
+ <!-- Buttons -->
+ <dimen name="car_pill_button_size">76dp</dimen>
<!-- Minimum touch target size. -->
<dimen name="car_touch_target_size">96dp</dimen>
+ <!-- Status Bar -->
+ <dimen name="car_status_bar_height">56dp</dimen>
+
<!-- Application Bar -->
<dimen name="car_app_bar_height">112dp</dimen>
@@ -50,4 +57,7 @@
<!-- Sub Header -->
<dimen name="car_sub_header_height">96dp</dimen>
+
+ <!-- The height of a vertical line divider. -->
+ <dimen name="car_vertical_line_divider_height">96dp</dimen>
</resources>
diff --git a/car/res/values-h668dp/dimens.xml b/car/res/values-h668dp/dimens.xml
index ab0f120..46dfd27 100644
--- a/car/res/values-h668dp/dimens.xml
+++ b/car/res/values-h668dp/dimens.xml
@@ -24,10 +24,17 @@
<!-- Type Sizings -->
<dimen name="car_headline2_size">36sp</dimen>
+ <!-- Icons and Buttons -->
+ <!-- Icons -->
+ <dimen name="car_secondary_icon_size">36dp</dimen>
+
<!-- Car Component Dimensions -->
<!-- Application Bar -->
<dimen name="car_app_bar_height">96dp</dimen>
+ <!-- Action Bar -->
+ <dimen name="car_action_bar_height">128dp</dimen>
+
<!-- List Items -->
<dimen name="car_single_line_list_item_height">116dp</dimen>
@@ -41,4 +48,7 @@
<dimen name="car_drawer_list_item_icon_size">108dp</dimen>
<dimen name="car_drawer_list_item_small_icon_size">56dp</dimen>
<dimen name="car_drawer_list_item_end_icon_size">56dp</dimen>
+
+ <!-- The height of a vertical line divider. -->
+ <dimen name="car_vertical_line_divider_height">76dp</dimen>
</resources>
diff --git a/car/res/values-w1280dp/dimens.xml b/car/res/values-w1280dp/dimens.xml
index 418e51f..4003ac0 100644
--- a/car/res/values-w1280dp/dimens.xml
+++ b/car/res/values-w1280dp/dimens.xml
@@ -21,4 +21,7 @@
<!-- Keylines -->
<dimen name="car_keyline_4">182dp</dimen>
<dimen name="car_keyline_4_neg">-182dp</dimen>
+
+ <!-- Drawer Max Width -->
+ <dimen name="car_drawer_max_width">1200dp</dimen>
</resources>
diff --git a/car/res/values-w690dp/integers.xml b/car/res/values-w690dp/integers.xml
index 0eb5837..77a164a 100644
--- a/car/res/values-w690dp/integers.xml
+++ b/car/res/values-w690dp/integers.xml
@@ -23,8 +23,11 @@
<integer name="column_card_default_column_span">12</integer>
<!-- Dialogs -->
- <integer name="car_dialog_column_number">10</integer>
+ <integer name="car_dialog_column_number">12</integer>
<!-- Slide Up Menu -->
<integer name="car_slide_up_menu_column_number">12</integer>
+
+ <!-- Slide Down Menu -->
+ <integer name="car_slide_down_menu_column_number">12</integer>
</resources>
diff --git a/car/res/values-w930dp/dimens.xml b/car/res/values-w930dp/dimens.xml
index 0e68594..0fd925b 100644
--- a/car/res/values-w930dp/dimens.xml
+++ b/car/res/values-w930dp/dimens.xml
@@ -29,4 +29,7 @@
<dimen name="car_keyline_4_neg">-168dp</dimen>
<!-- The diff between keyline 1 and keyline 3. -->
<dimen name="car_keyline_1_keyline_3_diff">96dp</dimen>
+
+ <!-- Grid Spacing -->
+ <dimen name="car_grid_spacing_minimum">32dp</dimen>
</resources>
diff --git a/car/res/values/colors.xml b/car/res/values/colors.xml
index a6fb6be..4a76c32 100644
--- a/car/res/values/colors.xml
+++ b/car/res/values/colors.xml
@@ -32,11 +32,10 @@
<color name="car_white_1000">#1effffff</color>
<color name="car_blue_grey_800">#ff37474F</color>
<color name="car_blue_grey_900">#ff263238</color>
- <color name="car_dark_blue_grey_600">#ff1d272d</color>
+ <color name="car_dark_blue_grey_600">#ff222B31</color>
<color name="car_dark_blue_grey_700">#ff172026</color>
<color name="car_dark_blue_grey_800">#ff11181d</color>
- <color name="car_dark_blue_grey_900">#ff0c1013</color>
- <color name="car_dark_blue_grey_1000">#ff090c0f</color>
+ <color name="car_dark_blue_grey_900">#ff090C0F</color>
<color name="car_light_blue_300">#ff4fc3f7</color>
<color name="car_light_blue_500">#ff03A9F4</color>
<color name="car_light_blue_600">#ff039be5</color>
@@ -175,7 +174,7 @@
<!-- The inverted color of the seekbar track background. This color is always the opposite of
car_seekbar_track_background. -->
- <color name="car_seekbar_track_background_inverse"> @color/car_seekbar_track_background_light
+ <color name="car_seekbar_track_background_inverse">@color/car_seekbar_track_background_light
</color>
<!-- The color of the seekbar track background in SeekbarListItem. This color is assumed to be
on a light-colored background. -->
diff --git a/car/res/values/dimens.xml b/car/res/values/dimens.xml
index 2f77343..c310ec7 100644
--- a/car/res/values/dimens.xml
+++ b/car/res/values/dimens.xml
@@ -62,15 +62,20 @@
<dimen name="car_body4_size">14sp</dimen>
<dimen name="car_body5_size">18sp</dimen>
<dimen name="car_label1_size">26sp</dimen>
+ <dimen name="car_label2_size">64sp</dimen>
<dimen name="car_action1_size">26sp</dimen>
+ <dimen name="car_action2_size">26sp</dimen>
<!-- Icons and Buttons -->
<!-- Icons -->
<dimen name="car_primary_icon_size">44dp</dimen>
<dimen name="car_secondary_icon_size">24dp</dimen>
+ <dimen name="car_fab_icon_size">76dp</dimen>
+ <dimen name="car_app_icon_size">76dp</dimen>
<!-- Avatars -->
<dimen name="car_avatar_size">56dp</dimen>
+ <dimen name="car_large_avatar_size">96dp</dimen>
<!-- Minimum touch target size. -->
<dimen name="car_touch_target_size">76dp</dimen>
@@ -81,13 +86,22 @@
<dimen name="car_button_horizontal_padding">@dimen/car_padding_4</dimen>
<dimen name="car_borderless_button_horizontal_padding">0dp</dimen>
<dimen name="car_button_radius">@dimen/car_radius_1</dimen>
+ <dimen name="car_pill_button_size">56dp</dimen>
+
+ <!-- Status Bar -->
+ <dimen name="car_status_bar_height">36dp</dimen>
+ <dimen name="car_status_bar_icon_size">24dp</dimen>
+
+ <!-- Navigation Bar -->
+ <dimen name="car_navigation_bar_height">80dp</dimen>
<!-- Application Bar -->
<dimen name="car_app_bar_height">80dp</dimen>
<dimen name="car_app_bar_default_elevation">8dp</dimen>
+ <dimen name="car_application_icon_size">44dp</dimen>
<!-- Action Bar -->
- <dimen name="car_action_bar_height">128dp</dimen>
+ <dimen name="car_action_bar_height">96dp</dimen>
<dimen name="car_action_bar_buttons_space">@dimen/car_padding_4</dimen>
<dimen name="car_action_bar_button_width">128dp</dimen>
<dimen name="car_action_bar_button_height">128dp</dimen>
@@ -146,6 +160,9 @@
<!-- Text Input -->
<dimen name="car_text_input_line_height">2dp</dimen>
+ <!-- Grid Spacing -->
+ <dimen name="car_grid_spacing_minimum">32dp</dimen>
+
<!-- PagedListView Dimensions -->
<!-- Sample row height used for scroll bar calculations in the off chance that a view hasn't
been measured. It's highly unlikely that this value will actually be used for more than
@@ -164,6 +181,9 @@
cover the screen. -->
<dimen name="car_drawer_margin_end">96dp</dimen>
+ <!-- Drawer Max Width -->
+ <dimen name="car_drawer_max_width">720dp</dimen>
+
<!-- Dimensions of the back arrow in the drawer. -->
<dimen name="car_arrow_size">96dp</dimen>
<dimen name="car_arrow_thickness">3dp</dimen>
diff --git a/car/res/values/integers.xml b/car/res/values/integers.xml
index a9f6284..1acb572 100644
--- a/car/res/values/integers.xml
+++ b/car/res/values/integers.xml
@@ -28,6 +28,9 @@
<!-- Slide Up Menu -->
<integer name="car_slide_up_menu_column_number">4</integer>
+ <!-- Slide Down Menu -->
+ <integer name="car_slide_down_menu_column_number">4</integer>
+
<!-- The length limit of body text in a paged list item. String longer than this limit should be
truncated. -->
<integer name="car_list_item_text_length_limit">120</integer>
diff --git a/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index 2205464..7cb0bfd 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -318,7 +318,7 @@
@SuppressWarnings("NewApi")
private static void checkThread(WebView webview) {
if (BuildCompat.isAtLeastP()) {
- if (webview.getLooper() != Looper.myLooper()) {
+ if (webview.getWebViewLooper() != Looper.myLooper()) {
throw new RuntimeException("A WebView method was called on thread '"
+ Thread.currentThread().getName() + "'. "
+ "All WebView methods must be called on the same thread. "