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

Commit 48816084 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Extracting status bar from quick settings in split shade" into sc-v2-dev am: 500cc42c 

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

Change-Id: Ic149ef615b4f9507112c9348545ee6b38f8f2168
parents cafd93f0 500cc42c

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

+4 −0
Original line number Diff line number Diff line
@@ -21,4 +21,8 @@ 


    <!-- Overload default clock widget parameters -->

    <dimen name="widget_big_font_size">88dp</dimen>



    <dimen name="qs_header_system_icons_area_height">0dp</dimen>

    <dimen name="qs_panel_padding_top">0dp</dimen>



</resources>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_customize_panel_content.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <View

        android:id="@+id/customizer_transparent_view"

        android:layout_width="match_parent"

        android:layout_height="@*android:dimen/quick_qs_offset_height"

        android:layout_height="@dimen/qs_header_system_icons_area_height"

        android:background="@android:color/transparent" />



    <com.android.keyguard.AlphaOptimizedLinearLayout

packages/SystemUI/res/layout/status_bar_expanded.xml

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <include layout="@layout/quick_qs_status_icons"/>



        <include

            layout="@layout/keyguard_status_view"

            android:visibility="gone"/>

packages/SystemUI/res/values/dimens.xml

+7 −1
Original line number Diff line number Diff line
@@ -402,8 +402,11 @@ 
    <dimen name="status_bar_header_padding_bottom">48dp</dimen>



    <!-- The height of the container that holds the battery and time in the quick settings header.

    Preferred over using "@*android:dimen/quick_qs_offset_height" as system icons are not always

    present in quick settings (e.g. in split shade) and it's useful to be able to override this

    value in such cases.

         -->

    <dimen name="qs_header_system_icons_area_height">48dp</dimen>

    <dimen name="qs_header_system_icons_area_height">@*android:dimen/quick_qs_offset_height</dimen>



    <!-- How far the quick-quick settings panel extends below the status bar -->

    <dimen name="qs_quick_header_panel_height">128dp</dimen>
@@ -455,6 +458,9 @@ 
    <!-- Width for the notification panel and related windows -->

    <dimen name="match_parent">-1px</dimen>



    <!-- Height of status bar in split shade mode - visible only on large screens -->

    <dimen name="split_shade_status_bar_height">@*android:dimen/quick_qs_offset_height</dimen>



    <!-- The top margin of the panel that holds the list of notifications. -->

    <dimen name="notification_panel_margin_top">0dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ public class QSContainerImpl extends FrameLayout { 
            QuickStatusBarHeaderController quickStatusBarHeaderController) {

        mQSPanelContainer.setPaddingRelative(

                getPaddingStart(),

                mContext.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.quick_qs_offset_height),

                mContext.getResources()

                        .getDimensionPixelSize(R.dimen.qs_header_system_icons_area_height),

                getPaddingEnd(),

                getPaddingBottom()

        );