summaryrefslogtreecommitdiff
path: root/packages/SystemUI/customization
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2022-11-21 16:25:13 +0000
committer Hawkwood Glazier <jglazier@google.com> 2022-11-21 16:26:10 +0000
commit9be68ce198c12f1dff995cb2fceae802470f2d18 (patch)
treef4161dc2343eea4a28c7f94d10a572b8ab7ca51b /packages/SystemUI/customization
parent90f48266bbe52c3beaeeab0e752560d8938f335c (diff)
Prevent scaling of clocks based on accessibility
The clocks were incorrectly scaling due to accessibility. This change also normalizes thier location to the library location. Bug: 256953236 Test: Manually tested on a few devices Change-Id: I51768a0ecbb83876fab92df3562d87cef3cf12ba
Diffstat (limited to 'packages/SystemUI/customization')
-rw-r--r--packages/SystemUI/customization/res/values-h700dp/dimens.xml20
-rw-r--r--packages/SystemUI/customization/res/values-h800dp/dimens.xml20
-rw-r--r--packages/SystemUI/customization/res/values/dimens.xml4
3 files changed, 42 insertions, 2 deletions
diff --git a/packages/SystemUI/customization/res/values-h700dp/dimens.xml b/packages/SystemUI/customization/res/values-h700dp/dimens.xml
new file mode 100644
index 000000000000..2a15981ab940
--- /dev/null
+++ b/packages/SystemUI/customization/res/values-h700dp/dimens.xml
@@ -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">170dp</dimen>
+</resources> \ No newline at end of file
diff --git a/packages/SystemUI/customization/res/values-h800dp/dimens.xml b/packages/SystemUI/customization/res/values-h800dp/dimens.xml
new file mode 100644
index 000000000000..60afc8a97a71
--- /dev/null
+++ b/packages/SystemUI/customization/res/values-h800dp/dimens.xml
@@ -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>
diff --git a/packages/SystemUI/customization/res/values/dimens.xml b/packages/SystemUI/customization/res/values/dimens.xml
index 8f90f0fefdb5..ba8f2843cdfc 100644
--- a/packages/SystemUI/customization/res/values/dimens.xml
+++ b/packages/SystemUI/customization/res/values/dimens.xml
@@ -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>