Merge "Fix bluetooth device shift on pairing" into sc-v2-dev
diff --git a/car-qc-lib/res/layout/qc_row_view.xml b/car-qc-lib/res/layout/qc_row_view.xml
index 16309de..5975426 100644
--- a/car-qc-lib/res/layout/qc_row_view.xml
+++ b/car-qc-lib/res/layout/qc_row_view.xml
@@ -21,9 +21,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
+ android:layout_marginVertical="@dimen/qc_row_margin_vertical"
android:clipToPadding="false"
android:minHeight="@dimen/qc_row_min_height"
- android:paddingVertical="@dimen/qc_row_padding_vertical"
android:paddingEnd="@dimen/qc_row_padding_end"
android:paddingStart="@dimen/qc_row_padding_start">
@@ -44,12 +44,14 @@
<com.android.car.ui.uxr.DrawableStateConstraintLayout
android:id="@+id/qc_row_content"
android:layout_width="0dp"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:background="?android:attr/selectableItemBackground"
app:layout_constraintStart_toEndOf="@+id/qc_row_start_items"
app:layout_constraintEnd_toStartOf="@+id/qc_row_end_items"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="parent">
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintHeight_default="wrap"
+ app:layout_constraintHeight_min="@dimen/qc_row_min_height">
<com.android.car.ui.uxr.DrawableStateImageView
android:id="@+id/qc_icon"
@@ -91,21 +93,22 @@
android:textAppearance="@style/TextAppearance.QC.Subtitle"
app:layout_constraintStart_toEndOf="@+id/barrier1"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/qc_title"/>
+ app:layout_constraintTop_toBottomOf="@+id/qc_title"
+ app:layout_constraintBottom_toTopOf="@+id/barrier2"/>
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:barrierDirection="bottom"
- app:constraint_referenced_ids="qc_icon,qc_title,qc_summary"
+ app:barrierDirection="top"
+ app:constraint_referenced_ids="qc_seekbar_wrapper"
app:barrierAllowsGoneWidgets="false"/>
<androidx.preference.UnPressableLinearLayout
android:id="@+id/qc_seekbar_wrapper"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:paddingVertical="@dimen/qc_seekbar_padding_vertical"
+ android:paddingTop="@dimen/qc_seekbar_padding_top"
android:focusable="true"
android:background="@drawable/qc_seekbar_wrapper_background"
android:clipChildren="false"
diff --git a/car-qc-lib/res/values/dimens.xml b/car-qc-lib/res/values/dimens.xml
index 778895f..6247561 100644
--- a/car-qc-lib/res/values/dimens.xml
+++ b/car-qc-lib/res/values/dimens.xml
@@ -18,7 +18,7 @@
<dimen name="qc_row_padding_start">32dp</dimen>
<dimen name="qc_row_padding_end">32dp</dimen>
<dimen name="qc_row_min_height">76dp</dimen>
- <dimen name="qc_row_padding_vertical">16dp</dimen>
+ <dimen name="qc_row_margin_vertical">10dp</dimen>
<dimen name="qc_row_icon_size">44dp</dimen>
<dimen name="qc_row_icon_margin_end">32dp</dimen>
<dimen name="qc_row_content_margin">16dp</dimen>
@@ -31,5 +31,5 @@
<dimen name="qc_toggle_foreground_icon_inset">14dp</dimen>
<dimen name="qc_toggle_unavailable_outline_width">2dp</dimen>
- <dimen name="qc_seekbar_padding_vertical">16dp</dimen>
+ <dimen name="qc_seekbar_padding_top">16dp</dimen>
</resources>
\ No newline at end of file