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

Commit 2dc4ad09 authored by Jesse Chan's avatar Jesse Chan
Browse files

SystemUI: QQS brightness: get container padding directly 



Change-Id: Ia74a4d4d56721947a029de30083a87244e20a139
Signed-off-by: default avatarJesse Chan <jc@lineageos.org>
parent 9edf5fe2

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+4 −4
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ 
    <!-- Layout containing tooltips, alarm text, etc. -->

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



    <FrameLayout

    <!-- Quick QS brightness bar -->

    <include layout="@layout/quick_settings_brightness_dialog"

        android:id="@+id/quick_qs_brightness_bar"

        android:layout_width="match_parent"

        android:layout_height="@dimen/brightness_mirror_height"

        android:layout_below="@id/header_text_container">

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

    </FrameLayout>

        android:layout_below="@id/header_text_container"

        android:visibility="gone" />



    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"

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

+6 −10
Original line number Diff line number Diff line
@@ -423,16 +423,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        mSystemIconsView.setLayoutParams(mSystemIconsView.getLayoutParams());



        if (mIsQuickQsBrightnessEnabled) {

            // Offset container margin to align quick QS brightness bar with QS brightness bar.

            RelativeLayout.LayoutParams lpQuickQsBrightness = (RelativeLayout.LayoutParams)

                    mQuickQsBrightness.getLayoutParams();

            lpQuickQsBrightness.setMargins(

                    resources.getDimensionPixelSize(R.dimen.notification_side_paddings)

                            - resources.getDimensionPixelSize(R.dimen.status_bar_padding_start),

                    0, resources.getDimensionPixelSize(R.dimen.notification_side_paddings)

                            - resources.getDimensionPixelSize(R.dimen.status_bar_padding_end),

                    0);

            mQuickQsBrightness.setLayoutParams(lpQuickQsBrightness);

            if (mIsQsAutoBrightnessEnabled && resources.getBoolean(

                    com.android.internal.R.bool.config_automatic_brightness_available)) {

                mQuickQsBrightness.findViewById(R.id.brightness_icon).setVisibility(View.VISIBLE);
@@ -577,6 +567,12 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        }

        mSpace.setLayoutParams(lp);

        setChipVisibility(mPrivacyChip.getVisibility() == View.VISIBLE);

        // Offset container padding to align with QS brightness bar.

        final int sp = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);

        RelativeLayout.LayoutParams lpQuickQsBrightness = (RelativeLayout.LayoutParams)

                mQuickQsBrightness.getLayoutParams();

        lpQuickQsBrightness.setMargins(sp - mPaddingLeft, 0, sp - mPaddingRight, 0);

        mQuickQsBrightness.setLayoutParams(lpQuickQsBrightness);

        return super.onApplyWindowInsets(insets);

    }