Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set secondaryView to GONE when invisible

Browse Source 
NotificationStackScrollLayout.footerView was hiding the "clear all"
button but not setting it to GONE so users could still tap the button
and clear all notifications even when the button was missing.

Bug: 144845029
Test: manual
Change-Id: Id99e7464f8944edd11e331368b1cdefa91beb71a
This commit is contained in:
Evan Laird
2020-03-31 18:08:47 -04:00
parent bc67fc79cb
commit 24483533e1
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java
View File

@@ -47,6 +47,18 @@ public abstract class StackScrollerDecorView extends ExpandableView {
}
};
private boolean mSecondaryAnimating = false;
private final Runnable mSecondaryVisibilityEndRunnable = () -> {
mSecondaryAnimating = false;
// If we were on screen, become GONE to avoid touches
if (mSecondaryView == null) return;
if (getVisibility() != View.GONE
&& mSecondaryView.getVisibility() != View.GONE
&& !mIsSecondaryVisible) {
mSecondaryView.setVisibility(View.GONE);
}
};
public StackScrollerDecorView(Context context, AttributeSet attrs) {
super(context, attrs);
setClipChildren(false);
@@ -88,9 +100,11 @@ public abstract class StackScrollerDecorView extends ExpandableView {
private void setContentVisible(boolean contentVisible, boolean animate) {
if (mContentVisible != contentVisible) {
mContentAnimating = animate;
setViewVisible(mContent, contentVisible, animate, mContentVisibilityEndRunnable);
mContentVisible = contentVisible;
} if (!mContentAnimating) {
setViewVisible(mContent, contentVisible, animate, mContentVisibilityEndRunnable);
}
if (!mContentAnimating) {
mContentVisibilityEndRunnable.run();
}
}
@@ -136,8 +150,13 @@ public abstract class StackScrollerDecorView extends ExpandableView {
*/
public void setSecondaryVisible(boolean nowVisible, boolean animate) {
if (mIsSecondaryVisible != nowVisible) {
setViewVisible(mSecondaryView, nowVisible, animate, null /* endRunnable */);
mSecondaryAnimating = animate;
mIsSecondaryVisible = nowVisible;
setViewVisible(mSecondaryView, nowVisible, animate, mSecondaryVisibilityEndRunnable);
}
if (!mSecondaryAnimating) {
mSecondaryVisibilityEndRunnable.run();
}
}
@@ -170,6 +189,12 @@ public abstract class StackScrollerDecorView extends ExpandableView {
if (view == null) {
return;
}
// Make sure we're visible so animations work
if (view.getVisibility() != View.VISIBLE) {
view.setVisibility(View.VISIBLE);
}
// cancel any previous animations
view.animate().cancel();
float endValue = nowVisible ? 1.0f : 0.0f;