Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a78e2b68 authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Merge "[TP] Fix carousel scaling" into tm-qpr-dev

parents 2443af6d 1a2ff992

res/layout/clock_carousel.xml

+2 −2
Original line number Diff line number Diff line
@@ -111,12 +111,12 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        app:layout_constraintGuide_begin="100dp" />

        app:layout_constraintGuide_begin="@dimen/clock_carousel_guideline_margin" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/guideline_end"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        app:layout_constraintGuide_end="100dp" />

        app:layout_constraintGuide_end="@dimen/clock_carousel_guideline_margin" />

</androidx.constraintlayout.motion.widget.MotionLayout>
 
 No newline at end of file

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -154,4 +154,5 @@ 
    <dimen name="clock_carousel_item_width">190dp</dimen>

    <dimen name="clock_carousel_item_height">380dp</dimen>

    <dimen name="clock_carousel_item_margin">16dp</dimen>

    <dimen name="clock_carousel_guideline_margin">140dp</dimen>

</resources>

res/xml/carousel_scene.xml

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
            android:id="@+id/item_view_0"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintEnd_toStartOf="@id/guideline_start"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />
@@ -59,6 +61,8 @@ 
            android:id="@+id/item_view_2"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintStart_toStartOf="@id/guideline_end"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />
@@ -69,6 +73,8 @@ 
            android:id="@+id/item_view_1"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintEnd_toStartOf="@id/guideline_start"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />
@@ -86,6 +92,8 @@ 
            android:id="@+id/item_view_3"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintStart_toStartOf="@id/guideline_end"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />
@@ -96,6 +104,8 @@ 
            android:id="@+id/item_view_2"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintEnd_toStartOf="@id/guideline_start"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />
@@ -113,6 +123,8 @@ 
            android:id="@+id/item_view_4"

            android:layout_width="@dimen/clock_carousel_item_width"

            android:layout_height="@dimen/clock_carousel_item_height"

            android:scaleX="0.5"

            android:scaleY="0.5"

            motion:layout_constraintStart_toStartOf="@id/guideline_end"

            motion:layout_constraintTop_toTopOf="parent"

            motion:layout_constraintBottom_toBottomOf="parent" />