DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: ee7bf21303 am: 6659422911
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15928355
Change-Id: Ifb06d7a41c6c5d2f4771a05fba4aee1c5180efa8
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/config.xml b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
index fed7d95..1686dda 100755
--- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
@@ -689,19 +689,4 @@
<item>G013B</item>
</string-array>
- <!-- Radius of the software rounded corners. -->
- <dimen name="rounded_corner_radius">48px</dimen>
-
- <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
- <dimen name="rounded_corner_radius_adjustment">0px</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">28dp</dimen>
- <dimen name="status_bar_height_landscape">24dp</dimen>
-
- <dimen name="quick_qs_offset_height">48dp</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>
</resources>
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..4712362
--- /dev/null
+++ b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2021, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Radius of the software rounded corners. -->
+ <dimen name="rounded_corner_radius">48px</dimen>
+
+ <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
+ <dimen name="rounded_corner_radius_adjustment">0px</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">28dp</dimen>
+ <dimen name="status_bar_height_landscape">24dp</dimen>
+
+ <dimen name="quick_qs_offset_height">28dp</dimen>
+</resources>
diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index f5d26be..ebfdcb1 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,6 +21,12 @@
<!-- 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>
+
+ <!-- Margin on the right side of the system icon group on Keyguard. -->
+ <dimen name="system_icons_keyguard_padding_end">9dp</dimen>
+
<!-- Location on the screen of the center of the physical power button. -->
<dimen name="physical_power_button_center_screen_location_y">450px</dimen>
diff --git a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 1d98cf9..c0fe31b 100644
--- a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,13 +21,16 @@
<dimen name="display_cutout_margin_consumption">0px</dimen>
<!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
- <dimen name="status_bar_header_height_keyguard">49dp</dimen>
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+
+ <!-- Margin on the right side of the system icon group on Keyguard. -->
+ <dimen name="system_icons_keyguard_padding_end">9dp</dimen>
<!-- Margin end of the system icons super container when the avatar is missing. -->
<dimen name="system_icons_super_container_avatarless_margin_end">10dp</dimen>
<!-- end margin for multi user switch in collapsed quick settings -->
- <dimen name="multi_user_switch_keyguard_margin">7dp</dimen>
+ <dimen name="multi_user_switch_keyguard_margin">9dp</dimen>
<!-- Location on the screen of the center of the physical power button. -->
<dimen name="physical_power_button_center_screen_location_y">780px</dimen>
diff --git a/manifest.xml b/manifest.xml
index 5954f56..627b5a1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -81,15 +81,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.confirmationui</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IConfirmationUI</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.drm</name>
<transport>hwbinder</transport>
<version>1.0</version>
