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

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

Fix large clock is too low in new customization picker 

Bug: 378795771
Flag: NONE bugfix
Test: manual test, observe vertical position of large clock is same with
    lockscreen

Change-Id: I16afafa7b7515606a0dbf9e45e19afb614cc6c0c
parent e2f85e6e

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/LockSection.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.ui.viewinterop.AndroidView 
import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.biometrics.AuthController

import com.android.systemui.customization.R as customR

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags
@@ -147,7 +148,7 @@ constructor( 
            } else {

                val scaleFactor = authController.scaleFactor

                val bottomPaddingPx =

                    context.resources.getDimensionPixelSize(R.dimen.lock_icon_margin_bottom)

                    context.resources.getDimensionPixelSize(customR.dimen.lock_icon_margin_bottom)

                val heightPx = windowViewBounds.bottom.toFloat()



                Pair(

packages/SystemUI/customization/res/values-land/dimens.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 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="lock_icon_margin_bottom">24dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/customization/res/values-sw600dp-land/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources>

    <dimen name="keyguard_smartspace_top_offset">0dp</dimen>

    <dimen name="status_view_margin_horizontal">8dp</dimen>

    <dimen name="lock_icon_margin_bottom">60dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/customization/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ 
    <dimen name="date_weather_view_height">24dp</dimen>

    <dimen name="enhanced_smartspace_height">104dp</dimen>

    <dimen name="status_view_margin_horizontal">0dp</dimen>

    <dimen name="lock_icon_margin_bottom">74dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
    <dimen name="notification_blocker_channel_list_height">128dp</dimen>



    <dimen name="keyguard_indication_margin_bottom">8dp</dimen>

    <dimen name="lock_icon_margin_bottom">24dp</dimen>



    <!-- Keyboard shortcuts helper -->

    <dimen name="ksh_container_horizontal_margin">48dp</dimen>