Merge "Hide notification footer when QS is expanded." into sc-v2-dev
This commit is contained in:
@@ -682,6 +682,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
boolean showFooterView = (showDismissView || getVisibleNotificationCount() > 0)
|
||||
&& mIsCurrentUserSetup // see: b/193149550
|
||||
&& mStatusBarState != StatusBarState.KEYGUARD
|
||||
&& mQsExpansionFraction != 1
|
||||
&& !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()
|
||||
&& !mIsRemoteInputActive;
|
||||
boolean showHistory = Settings.Secure.getIntForUser(mContext.getContentResolver(),
|
||||
@@ -4766,6 +4767,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
public void setQsExpansionFraction(float qsExpansionFraction) {
|
||||
boolean footerAffected = mQsExpansionFraction != qsExpansionFraction
|
||||
&& (mQsExpansionFraction == 1 || qsExpansionFraction == 1);
|
||||
mQsExpansionFraction = qsExpansionFraction;
|
||||
updateUseRoundedRectClipping();
|
||||
|
||||
@@ -4774,6 +4777,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
if (mOwnScrollY > 0) {
|
||||
setOwnScrollY((int) MathUtils.lerp(mOwnScrollY, 0, mQsExpansionFraction));
|
||||
}
|
||||
if (footerAffected) {
|
||||
updateFooter();
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.COORDINATOR)
|
||||
|
||||
Reference in New Issue
Block a user