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

Commit ee4098c1 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Adds way to hide the clock in lock screen preview." into tm-qpr-dev am:... 

Merge "Adds way to hide the clock in lock screen preview." into tm-qpr-dev am: 7c1e07e5 am: 84c9861d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21353673



Change-Id: I2b85aaf4d89f9c1985eeea96545b41517038ec21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0713cc0 84c9861d

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/shared/model/ClockPreviewConstants.kt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

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

 *

 */



package com.android.systemui.shared.clocks.shared.model



object ClockPreviewConstants {

    const val KEY_HIDE_CLOCK = "hide_clock"

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+6 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.keyguard.ui.viewmodel.KeyguardBottomAreaViewModel

import com.android.systemui.shared.clocks.ClockRegistry

import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants

import com.android.systemui.shared.quickaffordance.shared.model.KeyguardQuickAffordancePreviewConstants

import com.android.systemui.statusbar.phone.KeyguardBottomAreaView

import dagger.assisted.Assisted
@@ -69,6 +70,8 @@ constructor( 
            KeyguardQuickAffordancePreviewConstants.KEY_HIGHLIGHT_QUICK_AFFORDANCES,

            false,

        )

    private val shouldHideClock: Boolean =

        bundle.getBoolean(ClockPreviewConstants.KEY_HIDE_CLOCK, false)



    private var host: SurfaceControlViewHost
@@ -104,7 +107,9 @@ constructor( 
            val rootView = FrameLayout(context)



            setUpBottomArea(rootView)

            if (!shouldHideClock) {

                setUpClock(rootView)

            }



            rootView.measure(

                View.MeasureSpec.makeMeasureSpec(