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

Commit 30ff024a authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Add margin above ambient indication container" into tm-qpr-dev am: 6024e659 am: 3b338095 

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



Change-Id: I9c7b9c35119c69fdb626fb47926b354a40d09ef4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 673dcf1a 3b338095

packages/SystemUI/res-keyguard/values-h650dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ 


<resources>

    <dimen name="widget_big_font_size">54dp</dimen>



    <!-- Margin above the ambient indication container -->

    <dimen name="ambient_indication_container_margin_top">10dp</dimen>

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
    <!-- Minimum bottom margin under the security view -->

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



    <!-- Margin above the ambient indication container -->

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



    <dimen name="keyguard_eca_top_margin">18dp</dimen>

    <dimen name="keyguard_eca_bottom_margin">12dp</dimen>

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 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>

    <!-- Margin above the ambient indication container -->

    <dimen name="ambient_indication_container_margin_top">15dp</dimen>

</resources>
 
 No newline at end of file

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

+3 −0
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ 
<resources>

    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>



    <!-- Margin above the ambient indication container -->

    <dimen name="ambient_indication_container_margin_top">20dp</dimen>

</resources>