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

Merge "Fix last notification trimmed on lockscreen" into tm-dev

Browse Source
This commit is contained in:
Nicolò Mazzucato
2022-03-16 15:00:26 +00:00
committed by Android (Google) Code Review
parent aa61eeefa7 c060228cc2
commit d8a9414be0
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -782,6 +782,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
y = (int) (mAmbientState.getStackY() + mAmbientState.getStackHeight());
drawDebugInfo(canvas, y, Color.BLUE,
/* label= */ "mAmbientState.getStackY() + mAmbientState.getStackHeight() = "+y);
y = (int) mAmbientState.getStackY() + mContentHeight;
drawDebugInfo(canvas, y, Color.MAGENTA,
/* label= */ "mAmbientState.getStackY() + mContentHeight = " + y);
y = (int) mAmbientState.getStackY() + mIntrinsicContentHeight;
drawDebugInfo(canvas, y, Color.YELLOW,
/* label= */ "mAmbientState.getStackY() + mIntrinsicContentHeight = " + y);
}
private void drawDebugInfo(Canvas canvas, int y, int color, String label) {
@@ -1293,14 +1301,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mOnStackYChanged.accept(listenerNeedsAnimation);
}
if (mQsExpansionFraction <= 0 && !shouldSkipHeightUpdate()) {
final float endHeight = updateStackEndHeight(
getHeight(), getEmptyBottomMargin(), mTopPadding);
final float endHeight = updateStackEndHeight();
updateStackHeight(endHeight, fraction);
}
}
public float updateStackEndHeight(float height, float bottomMargin, float topPadding) {
final float stackEndHeight = Math.max(0f, height - bottomMargin - topPadding);
private float updateStackEndHeight() {
final float stackEndHeight = Math.max(0f, mIntrinsicContentHeight);
mAmbientState.setStackEndHeight(stackEndHeight);
return stackEndHeight;
}

11
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
View File

@@ -160,17 +160,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
doNothing().when(mNotificationShelf).setAnimationsEnabled(anyBoolean());
}
@Test
public void testUpdateStackEndHeight_forEndOfStackHeightAnimation() {
final float nsslHeight = 10f;
final float bottomMargin = 1f;
final float topPadding = 1f;
mStackScroller.updateStackEndHeight(nsslHeight, bottomMargin, topPadding);
final float stackEndHeight = nsslHeight - bottomMargin - topPadding;
assertTrue(mAmbientState.getStackEndHeight() == stackEndHeight);
}
@Test
public void testUpdateStackHeight_withDozeAmount_whenDozeChanging() {
final float dozeAmount = 0.5f;