summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Lin <lbill@google.com>2021-06-30 19:42:43 +0800
committerBill Lin <lbill@google.com>2021-07-02 20:57:01 +0800
commit73d1bf943a79016c215ab20c0e522424a3a98f84 (patch)
treee6e7d93aa1e0427d7a51ceb520f63d7ae2fff185
parent3273f08ea4972743579144066c5e6b049f68ab74 (diff)
downloadcrosshatch-73d1bf943a79016c215ab20c0e522424a3a98f84.tar.gz
Customize runded radius and top padding for Blueline
1. The rounded corner is too large on Blueline 2. Customize status bar height Test: atest SystemUITests Bug: 189423980 Change-Id: Idb7ae0d01d13e8a53790faa07f7e69c1b3360065
-rwxr-xr-xblueline/overlay/frameworks/base/core/res/res/values/config.xml16
-rw-r--r--blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml2
-rw-r--r--blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml3
3 files changed, 20 insertions, 1 deletions
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 37a77cc6..5db29a71 100755
--- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
@@ -689,6 +689,20 @@
<item>G013B</item>
</string-array>
- <dimen name="rounded_corner_radius">70px</dimen>
+ <!-- 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>
+
+ <!-- Height of area above QQS where battery/time go (equal to status bar) -->
+ <dimen name="quick_qs_offset_height">28dp</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/packages/SystemUI/res/values/config.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index d6df6566..cb533d23 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -41,4 +41,6 @@
<item>0</item> <!-- 3: HIGH -->
<item>0</item> <!-- 4: SUN -->
</integer-array>
+
+ <bool name="config_roundedCornerMultipleRadius">false</bool>
</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 dc341b33..f5d26be5 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -18,6 +18,9 @@
<resources>
<dimen name="rounded_corner_content_padding">28px</dimen>
+ <!-- the padding on the top of the statusbar (usually 0) -->
+ <dimen name="status_bar_padding_top">1px</dimen>
+
<!-- Location on the screen of the center of the physical power button. -->
<dimen name="physical_power_button_center_screen_location_y">450px</dimen>