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

Commit 7119cb7f authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Lockscreen/Shade upscaling" into tm-dev

parents 5a917ebf ad6a3e02

packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
    systemui:layout_constraintStart_toStartOf="parent"

    systemui:layout_constraintEnd_toEndOf="parent"

    systemui:layout_constraintTop_toTopOf="parent"

    android:layout_marginHorizontal="@dimen/status_view_margin_horizontal"

    android:layout_width="0dp"

    android:layout_height="wrap_content">

    <LinearLayout

packages/SystemUI/res/layout/notif_half_shelf.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


    <LinearLayout

        android:id="@+id/half_shelf"

        android:layout_width="@dimen/qs_panel_width"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:gravity="bottom"

packages/SystemUI/res/layout/status_bar_expanded.xml

+4 −2
Original line number Diff line number Diff line
@@ -94,10 +94,11 @@ 
        <FrameLayout

            android:id="@+id/qs_frame"

            android:layout="@layout/qs_panel"

            android:layout_width="@dimen/qs_panel_width"

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:clipToPadding="false"

            android:clipChildren="false"

            android:layout_marginHorizontal="@dimen/notification_panel_margin_horizontal"

            systemui:viewType="com.android.systemui.plugins.qs.QS"

            systemui:layout_constraintStart_toStartOf="parent"

            systemui:layout_constraintEnd_toEndOf="parent"
@@ -115,8 +116,9 @@ 
        <com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

            android:id="@+id/notification_stack_scroller"

            android:layout_marginTop="@dimen/notification_panel_margin_top"

            android:layout_width="@dimen/notification_panel_width"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_marginHorizontal="@dimen/notification_panel_margin_horizontal"

            android:layout_marginBottom="@dimen/notification_panel_margin_bottom"

            android:importantForAccessibility="no"

            systemui:layout_constraintStart_toStartOf="parent"

packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/plugin_frame"

    android:theme="@style/Theme.SystemUI.QuickSettings"

    android:layout_width="@dimen/qs_panel_width"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal"

    android:layout_marginTop="@dimen/notification_side_paddings"

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

+1 −0
Original line number Diff line number Diff line
@@ -46,4 +46,5 @@ 
     the shade -->

    <dimen name="lockscreen_shade_media_transition_distance">200dp</dimen>



    <dimen name="notification_panel_margin_horizontal">12dp</dimen>

</resources>