Fix KeyguardStatusBar height not align StatusBar
Update customization for O6/R4
1. Put status_bar_header_height_kegyuard in correct folder
2. Refine system_icons_super_container_avatarless_margin_end
3. Refine the config_mainBuiltInDisplayCutoutRectApproximation xPos
4. Remove unused system_icons_keyguard_padding_end
5. Adjust window rounded corner radius to match H/W corners
Test: manual build and check visual
Test: In keyguard, launch camera and exit, check provacy dot position
Test: In Keyguard, check keyguard status bar height algin home statusbar
Test: atest SystemUITests
Bug: 194324044
Change-Id: I8856b0ae9d5124b44a3aab89b0de8d8ddbe5a4c8
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 83e3c32..4fcf00e 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -79,7 +79,7 @@
</string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
- M 480,0
+ M 492,0
h 118
v 118
h -118
@@ -88,14 +88,14 @@
</string>
<!-- Radius of the software rounded corners. -->
- <dimen name="rounded_corner_radius">25px</dimen>
+ <dimen name="rounded_corner_radius">28px</dimen>
<!-- Height of the status bar in portrait. The height should be
Max((status bar content height + waterfall top size), top cutout size) -->
- <dimen name="status_bar_height_portrait">118px</dimen>
+ <dimen name="status_bar_height_portrait">124px</dimen>
<dimen name="status_bar_height_landscape">74px</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
- <dimen name="quick_qs_offset_height">118px</dimen>
+ <dimen name="quick_qs_offset_height">124px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index d415b72..806c60d 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -25,13 +25,16 @@
<!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</dimen>
- <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
- The icons always have a 4dp padding in the container so we only need 56 extra px of padding
- for the corners -->
- <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
- <!-- Multi user switch has some intrinsic padding to it -->
- <dimen name="multi_user_switch_keyguard_margin">40px</dimen>
+ <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
+ The icons always have a 4dp padding in the container so we only need 26 extra px of padding
+ for the corners -->
+ <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+
+ <!-- Margin on the right side of the system icon group on Keyguard. -->
+ <dimen name="system_icons_keyguard_padding_end">6dp</dimen>
<dimen name="keyguard_carrier_text_margin">0px</dimen>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 11950a9..c87a532 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -43,7 +43,7 @@
<!-- Radius of the software rounded corners. -->
- <dimen name="rounded_corner_radius">38px</dimen>
+ <dimen name="rounded_corner_radius">50px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
@@ -200,9 +200,6 @@
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen>
- <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
- <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
-
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
<bool name="config_faceAuthDismissesKeyguard">false</bool>
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 68c8115..899d24b 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -22,10 +22,16 @@
<!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</dimen>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+
<!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
- The icons always have a 4dp padding in the container so we only need 56 extra px of padding
+ The icons always have a 4dp padding in the container so we only need 26 extra px of padding
for the corners -->
- <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+ <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+
+ <!-- Margin on the right side of the system icon group on Keyguard. -->
+ <dimen name="system_icons_keyguard_padding_end">10dp</dimen>
<!-- A path similar to frameworks/base/core/res/res/values/config.xml
config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display