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

Merge "Adjusted the expand animation to be smooth again" into rvc-dev am: 8b9d2ed3ac am: 926c990b55

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11958696

Change-Id: I30cabb573742959d0a3ad86e838c3f08f387a3b5
This commit is contained in:
TreeHugger Robot
2020-06-23 01:27:16 +00:00
committed by Automerger Merge Worker
parent 94f082b4f2 926c990b55
commit 740c5ea960
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -535,6 +535,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
private float mLastSentAppear; private float mLastSentAppear;
private float mLastSentExpandedHeight; private float mLastSentExpandedHeight;
private boolean mWillExpand; private boolean mWillExpand;
private int mGapHeight;
private int mWaterfallTopInset; private int mWaterfallTopInset;
@@ -1060,6 +1061,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
Resources res = context.getResources(); Resources res = context.getResources();
mCollapsedSize = res.getDimensionPixelSize(R.dimen.notification_min_height); mCollapsedSize = res.getDimensionPixelSize(R.dimen.notification_min_height);
mGapHeight = res.getDimensionPixelSize(R.dimen.notification_section_divider_height);
mStackScrollAlgorithm.initView(context); mStackScrollAlgorithm.initView(context);
mAmbientState.reload(context); mAmbientState.reload(context);
mPaddingBetweenElements = Math.max(1, mPaddingBetweenElements = Math.max(1,
@@ -5099,8 +5101,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
} }
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW) @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public int getFooterViewHeight() { public int getFooterViewHeightWithPadding() {
return mFooterView == null ? 0 : mFooterView.getHeight() + mPaddingBetweenElements; return mFooterView == null ? 0 : mFooterView.getHeight()
+ mPaddingBetweenElements
+ mGapHeight;
} }
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW) @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -2397,8 +2397,8 @@ public class NotificationPanelViewController extends PanelViewController {
} }
@Override @Override
protected int getClearAllHeight() { protected int getClearAllHeightWithPadding() {
return mNotificationStackScroller.getFooterViewHeight(); return mNotificationStackScroller.getFooterViewHeightWithPadding();
} }
@Override @Override

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
View File

@@ -537,9 +537,9 @@ public abstract class PanelViewController {
// the animation only to the last notification, and then jump to the maximum panel height so // the animation only to the last notification, and then jump to the maximum panel height so
// clear all just fades in and the decelerating motion is towards the last notification. // clear all just fades in and the decelerating motion is towards the last notification.
final boolean clearAllExpandHack = expand && final boolean clearAllExpandHack = expand &&
shouldExpandToTopOfClearAll(getMaxPanelHeight() - getClearAllHeight()); shouldExpandToTopOfClearAll(getMaxPanelHeight() - getClearAllHeightWithPadding());
if (clearAllExpandHack) { if (clearAllExpandHack) {
target = getMaxPanelHeight() - getClearAllHeight(); target = getMaxPanelHeight() - getClearAllHeightWithPadding();
} }
if (target == mExpandedHeight || getOverExpansionAmount() > 0f && expand) { if (target == mExpandedHeight || getOverExpansionAmount() > 0f && expand) {
notifyExpandingFinished(); notifyExpandingFinished();
@@ -1030,9 +1030,9 @@ public abstract class PanelViewController {
protected abstract boolean isClearAllVisible(); protected abstract boolean isClearAllVisible();
/** /**
* @return the height of the clear all button, in pixels * @return the height of the clear all button, in pixels including padding
*/ */
protected abstract int getClearAllHeight(); protected abstract int getClearAllHeightWithPadding();
public void setHeadsUpManager(HeadsUpManagerPhone headsUpManager) { public void setHeadsUpManager(HeadsUpManagerPhone headsUpManager) {
mHeadsUpManager = headsUpManager; mHeadsUpManager = headsUpManager;