Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Match keyguard and regular status bar height on large screens" into tm-qpr-dev am: 1ca9fd74cd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20982137

Change-Id: I613a141ef7b20c18ff98a3774a8669de6ac30b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christian Göllner
2023-02-08 11:10:39 +00:00
committed by Automerger Merge Worker
parent 0bb9a62a9f 1ca9fd74cd
commit 61e3abd9a5
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values-sw600dp-land/dimens.xml
View File

@@ -45,8 +45,6 @@
<item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item> <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item>
<dimen name="controls_task_view_right_margin">8dp</dimen> <dimen name="controls_task_view_right_margin">8dp</dimen>
<dimen name="status_bar_header_height_keyguard">42dp</dimen>
<dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen> <dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen>
<dimen name="status_view_margin_horizontal">8dp</dimen> <dimen name="status_view_margin_horizontal">8dp</dimen>

5
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -16,8 +16,9 @@
*/ */
--> -->
<resources> <resources>
<!-- Height of the status bar header bar when on Keyguard --> <!-- Height of the status bar header bar when on Keyguard.
<dimen name="status_bar_header_height_keyguard">60dp</dimen> On large screens should be the same as the regular status bar. -->
<dimen name="status_bar_header_height_keyguard">@dimen/status_bar_height</dimen>
<!-- Size of user icon + frame in the qs user picker (incl. frame) --> <!-- Size of user icon + frame in the qs user picker (incl. frame) -->
<dimen name="qs_framed_avatar_size">60dp</dimen> <dimen name="qs_framed_avatar_size">60dp</dimen>

2
packages/SystemUI/res/values-sw720dp-land/dimens.xml
View File

@@ -22,8 +22,6 @@
<dimen name="keyguard_split_shade_top_margin">72dp</dimen> <dimen name="keyguard_split_shade_top_margin">72dp</dimen>
<dimen name="status_bar_header_height_keyguard">56dp</dimen>
<dimen name="status_view_margin_horizontal">24dp</dimen> <dimen name="status_view_margin_horizontal">24dp</dimen>
<dimen name="qs_media_session_height_expanded">184dp</dimen> <dimen name="qs_media_session_height_expanded">184dp</dimen>