summaryrefslogtreecommitdiff
path: root/packages/overlays/DisplayCutoutEmulationDoubleOverlay
diff options
context:
space:
mode:
author Shawn Lin <shawnlin@google.com> 2021-07-26 08:23:20 +0000
committer shawnlin <shawnlin@google.com> 2021-10-19 14:51:20 +0800
commit16496cb5c1f9d5e745099de153de1ed921aab9ff (patch)
tree5b17abd0afc1340d8f4ef36a16ef7578fc1261ff /packages/overlays/DisplayCutoutEmulationDoubleOverlay
parent8172fc3e42e54ac325640afc28fa538a8d8668e8 (diff)
Add APIs to get system bar heights
In multi-display devices, there might be differnt cutout on each display which also causes different status bar height. Now we no longer overlay the status_bar_height dimen and keep it as default value and add APIs to calculate the status bar size. - Add APIs for getting status_bar_height & quick_qs_offset_height in system. - Add APIs for getting split_shade_header_height and qs_header_system_icons_area_height in SystemUI. - Remove all resource overlay for status_bar_height & quick_qs_offset_height. Bug: 186604541 Test: atest SmallClockPositionTest DisplayLayoutTest HideDisplayCutoutOrganizerTest SizeCompatTests NotificationPanelViewControllerTest Change-Id: I5a6dfcc6ff06da8ea0fe119fc9d4c089f13b0dff
Diffstat (limited to 'packages/overlays/DisplayCutoutEmulationDoubleOverlay')
-rw-r--r--packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-land/config.xml22
-rw-r--r--packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml8
2 files changed, 0 insertions, 30 deletions
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-land/config.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-land/config.xml
deleted file mode 100644
index bd52901cef95..000000000000
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-land/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- ~ Copyright (C) 2018 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>
- <!-- Can't link to other dimensions here, but this should be status_bar_height_landscape -->
- <dimen name="quick_qs_offset_height">28dp</dimen>
- <!-- Total height of QQS in landscape; quick_qs_offset_height + 128 -->
- <dimen name="quick_qs_total_height">156dp</dimen>
-</resources> \ No newline at end of file
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml
index 80c997a46264..928d9dfa3ce1 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values/config.xml
@@ -56,14 +56,6 @@
-->
<bool name="config_fillMainBuiltInDisplayCutout">true</bool>
- <!-- Height of the status bar -->
- <dimen name="status_bar_height_portrait">48dp</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
- <dimen name="quick_qs_offset_height">48dp</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128) -->
- <dimen name="quick_qs_total_height">176dp</dimen>
-
</resources>