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

Commit 463d40b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifcd1f115,I4988c09c into tm-dev 

* changes:
  Renaming SplitShadeHeader to LargeScreenShadeHeader
  Showing wider header/status bar in shade on large screen
parents a441d81b 193baa3a

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

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <!-- 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">@dimen/qqs_layout_margin_top</dimen>



</resources>
 
 No newline at end of file

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-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,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="split_shade_header_height">42dp</dimen>

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



    <!-- Distance that the full shade transition takes in order to complete by tapping on a button

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

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ 
    <!-- Determines whether to allow the nav bar handle to be forced to be opaque. -->

    <bool name="allow_force_nav_bar_handle_opaque">false</bool>



    <bool name="config_use_large_screen_shade_header">true</bool>



</resources>