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

Commit ec4790e3 authored by Sherry Zhou's avatar Sherry Zhou
Browse files

Add RTL to small clock in picker carousel and size and color settings 

Test: manual
Bug: 286584898
Change-Id: I3aa0a9d3890cb9dab7a0e02839517f0b59954b7a
parent 6cb5cea2

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,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.ClockCarouselView

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
@@ -199,7 +200,7 @@ object ClockSettingsBinder { 
                                    sizeOptions.radioButtonDynamic.isChecked = false

                                    sizeOptions.radioButtonSmall.isChecked = true

                                    clockHostView.doOnPreDraw {

                                        it.pivotX = 0F

                                        it.pivotX = ClockCarouselView.getCenteredHostViewPivotX(it)

                                        it.pivotY = 0F

                                    }

                                }

src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt

+9 −3
Original line number Diff line number Diff line
@@ -231,11 +231,13 @@ class ClockCarouselView( 
                        }

                            ?: return

                    offCenterClockHostView.doOnPreDraw {

                        it.pivotX = progress * it.width / 2

                        it.pivotX =

                            progress * it.width / 2 + (1 - progress) * getCenteredHostViewPivotX(it)

                        it.pivotY = progress * it.height / 2

                    }

                    toCenterClockHostView.doOnPreDraw {

                        it.pivotX = (1 - progress) * it.width / 2

                        it.pivotX =

                            (1 - progress) * it.width / 2 + progress * getCenteredHostViewPivotX(it)

                        it.pivotY = (1 - progress) * it.height / 2

                    }

                    offCenterClockFrame.translationX =
@@ -439,7 +441,7 @@ class ClockCarouselView( 
        ) {

            clockHostView.doOnPreDraw {

                if (isMiddleView) {

                    it.pivotX = 0F

                    it.pivotX = getCenteredHostViewPivotX(it)

                    it.pivotY = 0F

                    clockView.translationX = 0F

                    clockView.translationY = 0F
@@ -529,6 +531,10 @@ class ClockCarouselView( 
            return rootViewId == R.id.item_view_2

        }



        fun getCenteredHostViewPivotX(hostView: View): Float {

            return if (hostView.isLayoutRtl) hostView.width.toFloat() else 0F

        }



        private fun getTranslationDistance(

            hostLength: Int,

            frameLength: Int,