Revert "Sets views clickable according to their visibility"

This reverts commit 1c36a5c708.

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

Change-Id: Id7f68ecab60f47fbf481601c5dc6c12093d78cda
Fixes: 122371174
Fixes: 122035663
This commit is contained in:
Fabian Kozynski
2019-01-09 15:37:30 +00:00
parent 1c36a5c708
commit f3a770104b
3 changed files with 7 additions and 10 deletions

View File

@@ -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" />

View File

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

View File

@@ -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());