Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev

This commit is contained in:
Riddle Hsu
2018-05-11 16:36:29 +00:00
committed by Android (Google) Code Review

View File

@@ -2222,7 +2222,7 @@ public class NotificationStackScrollLayout extends ViewGroup
}
private void updateScrollability() {
boolean scrollable = getScrollRange() > 0;
boolean scrollable = !mQsExpanded && getScrollRange() > 0;
if (scrollable != mScrollable) {
mScrollable = scrollable;
setFocusable(scrollable);
@@ -4500,6 +4500,7 @@ public class NotificationStackScrollLayout extends ViewGroup
public void setQsExpanded(boolean qsExpanded) {
mQsExpanded = qsExpanded;
updateAlgorithmLayoutMinHeight();
updateScrollability();
}
public void setQsExpansionFraction(float qsExpansionFraction) {