Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e3abd9 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Match keyguard and regular status bar height on large screens" into... 

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

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



Change-Id: I613a141ef7b20c18ff98a3774a8669de6ac30b95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bb9a62a 1ca9fd74

packages/SystemUI/res/values-sw600dp-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
    <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="status_bar_header_height_keyguard">42dp</dimen>



    <dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen>



    <dimen name="status_view_margin_horizontal">8dp</dimen>

packages/SystemUI/res/values-sw600dp/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
*/

-->

<resources>

    <!-- Height of the status bar header bar when on Keyguard -->

    <dimen name="status_bar_header_height_keyguard">60dp</dimen>

    <!-- Height of the status bar header bar when on Keyguard.

         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) -->

    <dimen name="qs_framed_avatar_size">60dp</dimen>

packages/SystemUI/res/values-sw720dp-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


    <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="qs_media_session_height_expanded">184dp</dimen>