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

Commit 5a914bb9 authored by Yalan Yiue's avatar Yalan Yiue Committed by Automerger Merge Worker
Browse files

Merge "Adjust large screen header margins in split shade" into tm-qpr-dev am: f59e756f 

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



Change-Id: I25dcab2364746dd581e483982b26212d0283f31d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d3815cb f59e756f

packages/SystemUI/res/layout/large_screen_shade_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:minHeight="@dimen/large_screen_shade_header_min_height"

    android:clickable="false"

    android:focusable="true"

    android:paddingLeft="@dimen/qs_panel_padding"

    android:paddingLeft="@dimen/large_screen_shade_header_left_padding"

    android:paddingRight="@dimen/qs_panel_padding"

    android:visibility="gone"

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

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    <dimen name="keyguard_status_view_bottom_margin">80dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">90dp</dimen>



    <dimen name="large_screen_shade_header_left_padding">24dp</dimen>

    <dimen name="qqs_layout_padding_bottom">40dp</dimen>



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

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ 
    <!-- Height of status bar in split shade mode - visible only on large screens -->

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

    <dimen name="large_screen_shade_header_left_padding">@dimen/qs_horizontal_margin</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

packages/SystemUI/src/com/android/systemui/statusbar/phone/LargeScreenShadeHeaderController.kt

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.phone



import android.app.StatusBarManager

import android.content.res.Configuration

import android.view.View

import android.widget.TextView

import androidx.constraintlayout.motion.widget.MotionLayout
@@ -204,6 +205,12 @@ class LargeScreenShadeHeaderController @Inject constructor( 


    private fun bindConfigurationListener() {

        val listener = object : ConfigurationController.ConfigurationListener {

            override fun onConfigChanged(newConfig: Configuration?) {

                val left = header.resources.getDimensionPixelSize(

                    R.dimen.large_screen_shade_header_left_padding)

                header.setPadding(

                    left, header.paddingTop, header.paddingRight, header.paddingBottom)

            }

            override fun onDensityOrFontScaleChanged() {

                val qsStatusStyle = R.style.TextAppearance_QS_Status

                FontSizeUtils.updateFontSizeFromStyle(clock, qsStatusStyle)