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

Commit 362fdb60 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge "Force date weather below small clock fallback RTL" into main

parents 730e53f8 8518039b

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.keyguard.ui.viewmodel 


import android.content.Context

import android.content.res.Resources

import android.util.LayoutDirection

import androidx.constraintlayout.helper.widget.Layer

import com.android.keyguard.ClockEventController

import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
@@ -256,7 +257,9 @@ constructor( 
                    isShadeLayoutWide,

                    configurationValues,

                    currentClock ->

                    if (hasCustomWeatherDataDisplay) {

                    val isRtlLayout = configurationValues.layoutDirection == LayoutDirection.RTL



                    if (hasCustomWeatherDataDisplay || isRtlLayout) {

                        return@combine true

                    }