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

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

Merge "Large screen clock carousel dimens" into udc-dev

parents 1cde12bc 582f6e1e

res/layout/clock_carousel.xml

+5 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <FrameLayout

        android:id="@+id/item_view_0"

        android:layout_width="@dimen/clock_carousel_item_width"

        android:layout_height="@dimen/clock_carousel_item_height"

        android:layout_height="@dimen/screen_preview_height"

        android:layout_marginEnd="@dimen/clock_carousel_item_margin"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/item_view_1"
@@ -54,7 +54,7 @@ 
    <FrameLayout

        android:id="@+id/item_view_1"

        android:layout_width="@dimen/clock_carousel_item_width"

        android:layout_height="@dimen/clock_carousel_item_height"

        android:layout_height="@dimen/screen_preview_height"

        android:layout_marginEnd="@dimen/clock_carousel_item_margin"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/item_view_2"
@@ -83,7 +83,7 @@ 
    <FrameLayout

        android:id="@+id/item_view_2"

        android:layout_width="@dimen/clock_carousel_item_width"

        android:layout_height="@dimen/clock_carousel_item_height"

        android:layout_height="@dimen/screen_preview_height"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintHorizontal_bias="0.5"
@@ -114,7 +114,7 @@ 
    <FrameLayout

        android:id="@+id/item_view_3"

        android:layout_width="@dimen/clock_carousel_item_width"

        android:layout_height="@dimen/clock_carousel_item_height"

        android:layout_height="@dimen/screen_preview_height"

        android:layout_marginStart="@dimen/clock_carousel_item_margin"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toEndOf="@+id/item_view_2"
@@ -143,7 +143,7 @@ 
    <FrameLayout

        android:id="@+id/item_view_4"

        android:layout_width="@dimen/clock_carousel_item_width"

        android:layout_height="@dimen/clock_carousel_item_height"

        android:layout_height="@dimen/screen_preview_height"

        android:layout_marginStart="@dimen/clock_carousel_item_margin"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toEndOf="@+id/item_view_3"

res/layout/single_clock_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<com.android.wallpaper.picker.DisplayAspectRatioFrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/clock_carousel_item_height">

    android:layout_height="@dimen/screen_preview_height">

    <FrameLayout

        android:id="@+id/single_clock_host_view"

        android:layout_width="match_parent"

res/values-h960dp-port/dimens.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

    <dimen name="clock_carousel_item_width">300dp</dimen>

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

    <dimen name="clock_carousel_item_card_width">120dp</dimen>

    <dimen name="clock_carousel_item_card_height">129dp</dimen>

</resources>
 
 No newline at end of file

res/values-w600dp/dimens.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

    <dimen name="clock_carousel_item_width">607dp</dimen>

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

    <dimen name="clock_carousel_item_card_width">175dp</dimen>

    <dimen name="clock_carousel_item_card_height">190dp</dimen>

</resources>

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
    <dimen name="keyguard_quick_affordance_icon_size">24dp</dimen>



    <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>

    <dimen name="clock_carousel_item_card_width">100dp</dimen>