diff options
| author | Shawn Lin <shawnlin@google.com> | 2021-10-25 04:07:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-25 04:07:13 +0000 |
| commit | d90aa9f2e3e8fcb75ec5f70c6a662b5b82a88028 (patch) | |
| tree | 424de27fdca04e8076a879027064038fe3f7d4ae | |
| parent | c9018499fe30286de264f33924ce675284040486 (diff) | |
| parent | 6c312b539a6b7965998edf6fd6ba267551d79153 (diff) | |
| download | sunfish-d90aa9f2e3e8fcb75ec5f70c6a662b5b82a88028.tar.gz | |
Merge "Remove resource overlays for system bar heights" into sc-v2-dev
| -rwxr-xr-x | sunfish/overlay/frameworks/base/core/res/res/values/config.xml | 11 | ||||
| -rw-r--r-- | sunfish/overlay/frameworks/base/packages/SystemUI/res/values/config.xml | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml index c7a6609f..e6c19b31 100755 --- a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml @@ -200,13 +200,10 @@ rounded_corner_radius to more accurately provide a "radius" for the rounded corners.--> <dimen name="rounded_corner_radius_adjustment">8px</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">136px</dimen> - <dimen name="status_bar_height_landscape">28dp</dimen> - - <!-- This is independent of status bar height --> - <dimen name="quick_qs_offset_height">48dp</dimen> + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height">28dp</dimen> <!-- the number of the max cached processes in the system. --> <integer name="config_customizedMaxCachedProcesses">64</integer> diff --git a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 56dbb18f..0eab2170 100644 --- a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -62,8 +62,8 @@ <!-- Padding around the status bar --> <dimen name="rounded_corner_content_padding">30px</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> + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> <!-- the padding on the top of the statusbar (usually 0) --> <dimen name="status_bar_padding_top">11dp</dimen> |