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

Commit 193baa3a authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Renaming SplitShadeHeader to LargeScreenShadeHeader 

Bug: 222472794
Test: code compiles and works
Change-Id: Ifcd1f11546cfb84a4760fb8c2cd134bdf366f8c2
parent 5ad1ec1c

packages/SystemUI/res/layout/combined_qs_header.xml

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/split_shade_status_bar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/split_shade_header_min_height"

    android:minHeight="@dimen/large_screen_shade_header_min_height"

    android:clickable="false"

    android:focusable="true"

    android:paddingLeft="@dimen/qs_panel_padding"
@@ -61,8 +61,8 @@ 
    <include

        android:id="@+id/carrier_group"

        layout="@layout/qs_carrier_group"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        android:minHeight="@dimen/split_shade_header_min_height"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        android:minHeight="@dimen/large_screen_shade_header_min_height"

        app:layout_constraintWidth_min="48dp"

        android:layout_width="0dp"

        android:layout_height="0dp"
@@ -78,7 +78,7 @@ 


    <com.android.systemui.statusbar.phone.StatusIconContainer

        android:id="@+id/statusIcons"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        android:layout_width="wrap_content"

        android:layout_height="48dp"
@@ -93,7 +93,7 @@ 
        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        app:textAppearance="@style/TextAppearance.QS.Status"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

        app:layout_constraintEnd_toEndOf="parent"

packages/SystemUI/res/layout/split_shade_header.xml→packages/SystemUI/res/layout/large_screen_shade_header.xml

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/split_shade_status_bar"

    android:layout_width="match_parent"

    android:layout_height="@dimen/split_shade_header_height"

    android:minHeight="@dimen/split_shade_header_min_height"

    android:layout_height="@dimen/large_screen_shade_header_height"

    android:minHeight="@dimen/large_screen_shade_header_min_height"

    android:clickable="false"

    android:focusable="true"

    android:paddingLeft="@dimen/qs_panel_padding"
@@ -32,7 +32,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="48dp"

        android:minHeight="@dimen/split_shade_header_min_height"

        android:minHeight="@dimen/large_screen_shade_header_min_height"

        android:gravity="start|center_vertical"

        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
@@ -69,7 +69,7 @@ 
                android:layout_gravity="end|center_vertical"

                android:layout_marginStart="8dp"

                android:focusable="false"

                android:minHeight="@dimen/split_shade_header_min_height"

                android:minHeight="@dimen/large_screen_shade_header_min_height"

                android:minWidth="48dp" />



            <com.android.systemui.statusbar.phone.StatusIconContainer

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

+1 −1
Original line number Diff line number Diff line
@@ -68,5 +68,5 @@ 
    <!-- The width of large/content heavy dialogs (e.g. Internet, Media output, etc) -->

    <dimen name="large_dialog_width">472dp</dimen>



    <dimen name="split_shade_header_height">42dp</dimen>

    <dimen name="large_screen_shade_header_height">42dp</dimen>

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 


    <dimen name="controls_padding_horizontal">75dp</dimen>



    <dimen name="split_shade_header_height">56dp</dimen>

    <dimen name="large_screen_shade_header_height">56dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -368,8 +368,8 @@ 
    <dimen name="match_parent">-1px</dimen>



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

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

    <dimen name="split_shade_header_min_height">@dimen/qs_header_row_min_height</dimen>

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

    <dimen name="large_screen_shade_header_min_height">@dimen/qs_header_row_min_height</dimen>



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

         On phones it's always 0dp but it's overridden in Car UI