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

Commit 0bdf0188 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Sets views clickable according to their visibility"

parents 9a789cd4 1c36a5c7

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+3 −2
Original line number Diff line number Diff line
@@ -24,13 +24,14 @@ 
    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:background="@android:color/transparent"

    android:baselineAligned="false"

    android:clickable="false"

    android:clickable="true"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingTop="0dp"

    android:paddingEnd="0dp"

    android:paddingStart="0dp"

    android:elevation="4dp" >

    android:elevation="4dp"

    android:importantForAccessibility="no" >



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

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

+7 −0
Original line number Diff line number Diff line
@@ -272,10 +272,17 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    public void updateEverything() {

        post(() -> {

            updateVisibilities();

            updateClickabilities();

            setClickable(false);

        });

    }



    private void updateClickabilities() {

        mMultiUserSwitch.setClickable(mMultiUserSwitch.getVisibility() == View.VISIBLE);

        mEdit.setClickable(mEdit.getVisibility() == View.VISIBLE);

        mSettingsButton.setClickable(mSettingsButton.getVisibility() == View.VISIBLE);

    }



    private void updateVisibilities() {

        mSettingsContainer.setVisibility(mQsDisabled ? View.GONE : View.VISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

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

+0 −5
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        if (mExpanded == expanded) return;

        mExpanded = expanded;

        mHeaderQsPanel.setExpanded(expanded);

        updateEverything();

    }



    /**
@@ -698,10 +697,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
                .start();

    }



    public void updateEverything() {

        post(() -> setClickable(false));

    }



    public void setQSPanel(final QSPanel qsPanel) {

        mQsPanel = qsPanel;

        setupHost(qsPanel.getHost());