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

Commit 898ff852 authored by Sherry Zhou's avatar Sherry Zhou
Browse files

Fix clock scale in picker 

Test: manual
Bug: 278023961
Change-Id: Iabb37ddd702f3ba3b4cc12be8f29aa37cb6ac67f
parent 705f871d

res/layout/clock_carousel.xml

+15 −10
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ 
            android:id="@+id/clock_scale_view_0"

            android:layout_width="@dimen/screen_preview_width"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            <FrameLayout

            android:layout_gravity="center"

            android:clipChildren="false">

            <com.android.customization.picker.clock.ui.view.ClockHostView

                android:id="@+id/clock_host_view_0"

                android:layout_width="match_parent"

                android:layout_height="match_parent"
@@ -72,8 +73,9 @@ 
            android:id="@+id/clock_scale_view_1"

            android:layout_width="@dimen/screen_preview_width"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            <FrameLayout

            android:layout_gravity="center"

            android:clipChildren="false">

            <com.android.customization.picker.clock.ui.view.ClockHostView

                android:id="@+id/clock_host_view_1"

                android:layout_width="match_parent"

                android:layout_height="match_parent"
@@ -104,8 +106,9 @@ 
            android:id="@+id/clock_scale_view_2"

            android:layout_width="@dimen/screen_preview_width"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            <FrameLayout

            android:layout_gravity="center"

            android:clipChildren="false">

            <com.android.customization.picker.clock.ui.view.ClockHostView

                android:id="@+id/clock_host_view_2"

                android:layout_width="match_parent"

                android:layout_height="match_parent"
@@ -134,8 +137,9 @@ 
            android:id="@+id/clock_scale_view_3"

            android:layout_width="@dimen/screen_preview_width"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            <FrameLayout

            android:layout_gravity="center"

            android:clipChildren="false">

            <com.android.customization.picker.clock.ui.view.ClockHostView

                android:id="@+id/clock_host_view_3"

                android:layout_width="match_parent"

                android:layout_height="match_parent"
@@ -164,8 +168,9 @@ 
            android:id="@+id/clock_scale_view_4"

            android:layout_width="@dimen/screen_preview_width"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            <FrameLayout

            android:layout_gravity="center"

            android:clipChildren="false">

            <com.android.customization.picker.clock.ui.view.ClockHostView

                android:id="@+id/clock_host_view_4"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

res/layout/fragment_clock_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
        android:layout_height="0dp"

        android:layout_weight="1"

        android:paddingTop="20dp"

        android:paddingBottom="40dp">

        android:paddingBottom="40dp"

        android:clipChildren="false">



        <include

            android:id="@+id/lock_preview"
@@ -43,7 +44,7 @@ 
            android:layout_height="match_parent"

            android:layout_gravity="center" />



        <FrameLayout

        <com.android.customization.picker.clock.ui.view.ClockHostView

            android:id="@+id/clock_host_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

res/layout/single_clock_view.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/screen_preview_width"

    android:layout_height="wrap_content"

    android:layout_gravity="center">

    <FrameLayout

    android:layout_gravity="center"

    android:clipChildren="false">

    <com.android.customization.picker.clock.ui.view.ClockHostView

        android:id="@+id/single_clock_host_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ object ClockCarouselViewBinder { 


                                hideSmartspace(hasCustomWeatherDataDisplay)

                            },

                            previewRatio = clockViewFactory.getRatio(),

                        )

                    }

                }

src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.content.res.Configuration 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.widget.FrameLayout

import android.widget.LinearLayout

import android.widget.SeekBar

import androidx.core.view.isInvisible
@@ -33,6 +32,7 @@ import androidx.recyclerview.widget.LinearLayoutManager 
import androidx.recyclerview.widget.RecyclerView

import com.android.customization.picker.clock.shared.ClockSize

import com.android.customization.picker.clock.ui.adapter.ClockSettingsTabAdapter

import com.android.customization.picker.clock.ui.view.ClockHostView

import com.android.customization.picker.clock.ui.view.ClockSizeRadioButtonGroup

import com.android.customization.picker.clock.ui.view.ClockViewFactory

import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
@@ -55,8 +55,7 @@ object ClockSettingsBinder { 
        clockViewFactory: ClockViewFactory,

        lifecycleOwner: LifecycleOwner,

    ) {

        val clockHostView: FrameLayout = view.requireViewById(R.id.clock_host_view)



        val clockHostView: ClockHostView = view.requireViewById(R.id.clock_host_view)

        val tabView: RecyclerView = view.requireViewById(R.id.tabs)

        val tabAdapter = ClockSettingsTabAdapter()

        tabView.adapter = tabAdapter