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

Commit 04725488 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Prevent scaling of clocks based on accessibility" into tm-qpr-dev am: f1be4f07 

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



Change-Id: I5865495a54085d58c0e15823ca456a185fdd063d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e6aac6a f1be4f07

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

+2 −2
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 The Android Open Source Project

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

packages/SystemUI/customization/res/values-h800dp/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>

    <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <dimen name="large_clock_text_size">200dp</dimen>

</resources>

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

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
-->

<resources>

    <!-- Clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <dimen name="large_clock_text_size">150sp</dimen>

    <dimen name="small_clock_text_size">86sp</dimen>

    <dimen name="large_clock_text_size">150dp</dimen>

    <dimen name="small_clock_text_size">86dp</dimen>



    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->

    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

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

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
  -->



<resources>

    <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <dimen name="large_clock_text_size">200dp</dimen>



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

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

</resources>