Merge "Large screen clock carousel dimens" into udc-dev am: cd6f960604 am: 27f57ff735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/22554105
Change-Id: I5c4dddad53de0cad2dc5232b70889319d70ceb2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/clock_carousel.xml b/res/layout/clock_carousel.xml
index 25af031..290bfa4 100644
--- a/res/layout/clock_carousel.xml
+++ b/res/layout/clock_carousel.xml
@@ -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"
diff --git a/res/layout/single_clock_view.xml b/res/layout/single_clock_view.xml
index e7ac518..3ba673b 100644
--- a/res/layout/single_clock_view.xml
+++ b/res/layout/single_clock_view.xml
@@ -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"
diff --git a/res/values-h960dp-port/dimens.xml b/res/values-h960dp-port/dimens.xml
new file mode 100644
index 0000000..9ab1757
--- /dev/null
+++ b/res/values-h960dp-port/dimens.xml
@@ -0,0 +1,22 @@
+<?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
diff --git a/res/values-w600dp/dimens.xml b/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..0f6c43f
--- /dev/null
+++ b/res/values-w600dp/dimens.xml
@@ -0,0 +1,22 @@
+<?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>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 18b38c8..0da5f0c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -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>
diff --git a/res/xml/carousel_scene.xml b/res/xml/carousel_scene.xml
index 267f0a1..d728dd8 100644
--- a/res/xml/carousel_scene.xml
+++ b/res/xml/carousel_scene.xml
@@ -41,7 +41,7 @@
<Constraint
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"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -49,7 +49,7 @@
<Constraint
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"
motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
motion:layout_constraintStart_toStartOf="parent"
@@ -60,7 +60,7 @@
<Constraint
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"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -68,7 +68,7 @@
<Constraint
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"
motion:layout_constraintStart_toEndOf="@+id/item_view_2"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -78,7 +78,7 @@
<Constraint
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"
motion:layout_constraintEnd_toStartOf="@+id/item_view_1"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -86,7 +86,7 @@
<Constraint
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"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -94,7 +94,7 @@
<Constraint
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"
motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
motion:layout_constraintStart_toStartOf="parent"
@@ -105,7 +105,7 @@
<Constraint
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"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -113,7 +113,7 @@
<Constraint
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"
motion:layout_constraintStart_toEndOf="@+id/item_view_3"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -123,7 +123,7 @@
<Constraint
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"
motion:layout_constraintEnd_toStartOf="@+id/item_view_2"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -131,7 +131,7 @@
<Constraint
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"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />
@@ -139,7 +139,7 @@
<Constraint
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"
motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
motion:layout_constraintStart_toStartOf="parent"
@@ -150,7 +150,7 @@
<Constraint
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"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
motion:layout_constraintBottom_toBottomOf="parent" />