Update barbet screen decorations
- Tweaked rounded corners to have different top and bottom assets, and
copied them from Bramble
- Adjusted the holepunch based on the pixel mapping
- Adjusted status bar height and top padding
- Configured the estimated display cutout area for a 121px box
Test: visual
Fixes: 171681765
Change-Id: I8d2af94cf4b24e60b04627c7c9e3c66c65a36010
diff --git a/barbet/overlay/frameworks/base/core/res/res/values/config.xml b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
index c661370..224a50b 100755
--- a/barbet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -189,20 +189,15 @@
<!-- Display cutout configuration -->
<string translatable="false" name="config_mainBuiltInDisplayCutout">
- <!-- The hole punch dimensions are this:
- M 43,75 a 31,31 0 1,0 62,0 a 31,31 0 1,0 -62,0
- but using a radius 32 circle for now to see the antialiasing.
- -->
- M 41,73 a 32,32 0 1 0 64,0 a 32,32 0 1 0 -64,0 Z
-
+ M 41.5,73 a 32,32 0 1 0 64,0 a 32,32 0 1 0 -64,0 Z
@left
</string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 0.0,0.0
- h 136
- v 136
- h -136
+ h 121
+ v 121
+ h -121
Z
@left
</string>
@@ -212,12 +207,10 @@
<!-- 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">136px</dimen>
+ <dimen name="status_bar_height_portrait">145px</dimen>
<dimen name="status_bar_height_landscape">28dp</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
- <dimen name="quick_qs_offset_height">136px</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128) -->
- <dimen name="quick_qs_total_height">488px</dimen>
+ <dimen name="quick_qs_offset_height">145px</dimen>
<!-- Enable CBRS support -->
<bool translatable="false" name="config_cbrs_supported">true</bool>
diff --git a/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 0000000..457a802
--- /dev/null
+++ b/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="238px"
+ android:height="238px"
+ android:viewportWidth="238"
+ android:viewportHeight="238">
+
+ <path
+ android:pathData="M238,0C217.2,0 196.26,-0.01 176.99,0.11C173.48,0.13 170.03,0.15 166.64,0.18C156.3,0.27 146.44,0.41 137.02,0.67C134.74,0.73 132.49,0.8 130.25,0.88C128.08,0.96 125.94,1.05 123.81,1.15C118.76,1.4 113.77,1.7 108.84,2.14C104.07,2.58 99.36,3.13 94.68,3.86C81.01,5.99 67.58,9.78 55.49,16.36C55.08,16.58 54.67,16.81 54.26,17.04C46.62,21.34 39.43,26.77 33.11,33.08C26.8,39.4 21.37,46.59 17.07,54.23C14.92,58.05 13.34,61.38 11.83,65.04C10.32,68.71 9.02,72.46 7.91,76.27C3.46,91.5 1.98,107.34 1.19,123.8C1.13,124.95 1.08,126.11 1.03,127.28L1.03,127.43C0.38,142.82 0.25,159.12 0.15,176.98C0.03,196.25 0.04,217.2 0.04,238L0,0.15L238,0Z"
+ android:fillColor="#000000" />
+
+</vector>
diff --git a/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
similarity index 93%
rename from barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
rename to barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
index 52c395a..4c84c40 100644
--- a/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
+++ b/barbet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -12,8 +12,8 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="226px"
- android:height="226px"
+ android:width="180px"
+ android:height="180px"
android:viewportWidth="226.0"
android:viewportHeight="226.0">
diff --git a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 67bcaa6..eb611d8 100644
--- a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -44,6 +44,9 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
+ <!-- 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>
+
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
to brightness values; -1 means keeping the current brightness. -->
<integer-array name="config_doze_brightness_sensor_to_brightness">
diff --git a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index dddc147..bf1fd82 100644
--- a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -24,7 +24,7 @@
<dimen name="rounded_corner_content_padding">50px</dimen>
<!-- the padding on the top of the statusbar (usually 0) -->
- <dimen name="status_bar_padding_top">1dp</dimen>
+ <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
