Merge changes from topic "am-8682d6a2-aa7f-4a73-a8d6-f2ead69fc0aa"
* changes:
[automerger] Avoid carried-over sub-view layout params. am: a565726ba2
Avoid carried-over sub-view layout params.
diff --git a/car/res/values-night/colors.xml b/car/res/values-night/colors.xml
index 2ca5b02..12eb594 100644
--- a/car/res/values-night/colors.xml
+++ b/car/res/values-night/colors.xml
@@ -16,6 +16,7 @@
-->
<resources>
<color name="car_title">@color/car_title_light</color>
+ <color name="car_title2">@color/car_title2_light</color>
<color name="car_body1">@color/car_body1_light</color>
<color name="car_body2">@color/car_body2_light</color>
diff --git a/car/res/values/colors.xml b/car/res/values/colors.xml
index 00c6cf9..5b90125 100644
--- a/car/res/values/colors.xml
+++ b/car/res/values/colors.xml
@@ -63,6 +63,10 @@
<color name="car_title_dark">@color/car_grey_900</color>
<color name="car_title">@color/car_title_dark</color>
+ <color name="car_title2_light">@color/car_grey_100</color>
+ <color name="car_title2_dark">@color/car_grey_900</color>
+ <color name="car_title2">@color/car_title2_dark</color>
+
<color name="car_headline1_light">@color/car_grey_100</color>
<color name="car_headline1_dark">@color/car_grey_800</color>
<color name="car_headline1">@color/car_headline1_dark</color>
diff --git a/car/res/values/styles.xml b/car/res/values/styles.xml
index d84f4c8..606bdc5 100644
--- a/car/res/values/styles.xml
+++ b/car/res/values/styles.xml
@@ -31,6 +31,23 @@
<item name="android:textColor">@color/car_title_light</item>
</style>
+ <!-- The styling for title2 text. The color of this text changes based on day/night mode. -->
+ <style name="CarTitle2">
+ <item name="android:textStyle">normal</item>
+ <item name="android:textSize">@dimen/car_title2_size</item>
+ <item name="android:textColor">@color/car_title2</item>
+ </style>
+
+ <!-- Title2 text that is permanently a dark color. -->
+ <style name="CarTitle2.Dark">
+ <item name="android:textColor">@color/car_title2_dark</item>
+ </style>
+
+ <!-- Title2 text that is permanently a light color. -->
+ <style name="CarTitle2.Light">
+ <item name="android:textColor">@color/car_title2_light</item>
+ </style>
+
<!-- The styling for the main headline text. The color of this text changes based on the
day/night mode. -->
<style name="CarHeadline1">
diff --git a/car/src/main/java/androidx/car/widget/PagedListView.java b/car/src/main/java/androidx/car/widget/PagedListView.java
index 16593b9..c821286 100644
--- a/car/src/main/java/androidx/car/widget/PagedListView.java
+++ b/car/src/main/java/androidx/car/widget/PagedListView.java
@@ -1033,8 +1033,18 @@
continue;
}
- int left = mDividerStartMargin + startChild.getLeft();
- int right = endChild.getRight();
+ Rect containerRect = new Rect();
+ container.getGlobalVisibleRect(containerRect);
+
+ Rect startRect = new Rect();
+ startChild.getGlobalVisibleRect(startRect);
+
+ Rect endRect = new Rect();
+ endChild.getGlobalVisibleRect(endRect);
+
+ int left = container.getLeft() + mDividerStartMargin
+ + (startRect.left - containerRect.left);
+ int right = container.getRight() - (endRect.right - containerRect.right);
int bottom = container.getBottom() + spacing / 2 + mDividerHeight / 2;
int top = bottom - mDividerHeight;