diff options
| -rw-r--r-- | car-qc-lib/res/layout/qc_row_view.xml | 3 | ||||
| -rw-r--r-- | car-qc-lib/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | car-qc-lib/src/com/android/car/qc/view/QCRowView.java | 10 |
3 files changed, 16 insertions, 1 deletions
diff --git a/car-qc-lib/res/layout/qc_row_view.xml b/car-qc-lib/res/layout/qc_row_view.xml index ee7f961..16309de 100644 --- a/car-qc-lib/res/layout/qc_row_view.xml +++ b/car-qc-lib/res/layout/qc_row_view.xml @@ -23,6 +23,7 @@ android:layout_centerVertical="true" 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"> @@ -30,6 +31,7 @@ android:id="@+id/qc_row_start_items" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/qc_action_items_horizontal_margin" android:orientation="horizontal" android:divider="@drawable/qc_row_action_divider" android:showDividers="middle" @@ -128,6 +130,7 @@ android:id="@+id/qc_row_end_items" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/qc_action_items_horizontal_margin" android:orientation="horizontal" android:divider="@drawable/qc_row_action_divider" android:showDividers="middle" diff --git a/car-qc-lib/res/values/dimens.xml b/car-qc-lib/res/values/dimens.xml index 73af227..778895f 100644 --- a/car-qc-lib/res/values/dimens.xml +++ b/car-qc-lib/res/values/dimens.xml @@ -17,11 +17,13 @@ <resources> <dimen name="qc_row_padding_start">32dp</dimen> <dimen name="qc_row_padding_end">32dp</dimen> - <dimen name="qc_row_min_height">96dp</dimen> + <dimen name="qc_row_min_height">76dp</dimen> + <dimen name="qc_row_padding_vertical">16dp</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> + <dimen name="qc_action_items_horizontal_margin">32dp</dimen> <dimen name="qc_toggle_size">72dp</dimen> <dimen name="qc_toggle_margin">12dp</dimen> <dimen name="qc_toggle_background_radius">16dp</dimen> diff --git a/car-qc-lib/src/com/android/car/qc/view/QCRowView.java b/car-qc-lib/src/com/android/car/qc/view/QCRowView.java index d7ec892..9fc5743 100644 --- a/car-qc-lib/src/com/android/car/qc/view/QCRowView.java +++ b/car-qc-lib/src/com/android/car/qc/view/QCRowView.java @@ -247,6 +247,11 @@ public class QCRowView extends FrameLayout { mStartItemsContainer.removeViews(startItemCount, mStartItemsContainer.getChildCount() - startItemCount); } + if (startItemCount == 0) { + mStartItemsContainer.setVisibility(View.GONE); + } else { + mStartItemsContainer.setVisibility(View.VISIBLE); + } int endItemCount = row.getEndItems().size(); for (int i = 0; i < endItemCount; i++) { @@ -258,6 +263,11 @@ public class QCRowView extends FrameLayout { mEndItemsContainer.removeViews(endItemCount, mEndItemsContainer.getChildCount() - endItemCount); } + if (endItemCount == 0) { + mEndItemsContainer.setVisibility(View.GONE); + } else { + mEndItemsContainer.setVisibility(View.VISIBLE); + } } private void initActionItem(@NonNull ViewGroup root, @Nullable View actionView, |