[TP] Fix digital clocks in clock carousel
1. Modify the view size of the clock carousel to make it same as the
screen preview
2. Choose a proper ratio for the text size for text view clocks
Test: Manually tested that the text clocks are showing
Bug: 262924055
Change-Id: I06220c4f10dc4b7b475efe5471dcf19a94a4ce82
diff --git a/res/xml/carousel_scene.xml b/res/xml/carousel_scene.xml
index 345f690..8c6738b 100644
--- a/res/xml/carousel_scene.xml
+++ b/res/xml/carousel_scene.xml
@@ -40,94 +40,82 @@
<ConstraintSet android:id="@+id/previous">
<Constraint
android:id="@+id/item_view_0"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_1"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/start">
<Constraint
android:id="@+id/item_view_1"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_3"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/next">
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_3"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_4"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
</MotionScene>
\ No newline at end of file