Merge "Fix split-shade expansion animation on non-lockscreen." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c4a0640361
@@ -1371,12 +1371,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
*/
|
||||
@ShadeViewRefactor(RefactorComponent.COORDINATOR)
|
||||
public void setExpandedHeight(float height) {
|
||||
final float shadeBottom = getHeight() - getEmptyBottomMargin();
|
||||
final boolean skipHeightUpdate = shouldSkipHeightUpdate();
|
||||
if (!skipHeightUpdate) {
|
||||
final float expansionFraction = MathUtils.saturate(height / shadeBottom);
|
||||
mAmbientState.setExpansionFraction(expansionFraction);
|
||||
}
|
||||
updateStackPosition();
|
||||
|
||||
if (!skipHeightUpdate) {
|
||||
|
||||
@@ -808,6 +808,7 @@ public abstract class PanelViewController {
|
||||
mExpansionDragDownAmountPx = h;
|
||||
mExpandedFraction = Math.min(1f,
|
||||
maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);
|
||||
mAmbientState.setExpansionFraction(mExpandedFraction);
|
||||
onHeightUpdated(mExpandedHeight);
|
||||
updatePanelExpansionAndVisibility();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user