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

This commit is contained in:
Hawkwood Glazier
2022-11-23 21:55:11 +00:00
committed by Android (Google) Code Review
4 changed files with 24 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
<!-- <!--
~ 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"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License. ~ you may not use this file except in compliance with the License.

View File

@@ -0,0 +1,20 @@
<!--
~ 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>

View File

@@ -17,8 +17,8 @@
--> -->
<resources> <resources>
<!-- Clock maximum font size (dp is intentional, to prevent any further scaling) --> <!-- Clock maximum font size (dp is intentional, to prevent any further scaling) -->
<dimen name="large_clock_text_size">150sp</dimen> <dimen name="large_clock_text_size">150dp</dimen>
<dimen name="small_clock_text_size">86sp</dimen> <dimen name="small_clock_text_size">86dp</dimen>
<!-- Default line spacing multiplier between hours and minutes of the keyguard clock --> <!-- 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> <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

View File

@@ -15,9 +15,6 @@
--> -->
<resources> <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 --> <!-- With the large clock, move up slightly from the center -->
<dimen name="keyguard_large_clock_top_margin">-112dp</dimen> <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>
</resources> </resources>