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

Commit f3a77010 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Revert "Sets views clickable according to their visibility" 

This reverts commit 1c36a5c7.

Reason for revert: This CL added bugs b/122371174, b/122035663

Change-Id: Id7f68ecab60f47fbf481601c5dc6c12093d78cda
Fixes: 122371174
Fixes: 122035663
parent 1c36a5c7

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

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

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

    android:baselineAligned="false"

    android:clickable="true"

    android:clickable="false"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingTop="0dp"

    android:paddingEnd="0dp"

    android:paddingStart="0dp"

    android:elevation="4dp"

    android:importantForAccessibility="no" >

    android:elevation="4dp" >



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

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

+0 −7
Original line number Diff line number Diff line
@@ -272,17 +272,10 @@ 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

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

        mExpanded = expanded;

        mHeaderQsPanel.setExpanded(expanded);

        updateEverything();

    }



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

    }



    public void updateEverything() {

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

    }



    public void setQSPanel(final QSPanel qsPanel) {

        mQsPanel = qsPanel;

        setupHost(qsPanel.getHost());