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

Merge "Fixes a crash with KeyguardStatusView in tests" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-12 20:14:51 +00:00
committed by Android (Google) Code Review
parent 2997615e73 f6d63f936b
commit ffb7b7feff
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -414,10 +414,12 @@ public class KeyguardStatusView extends GridLayout implements
int expanded = mOwnerInfo.getBottom() + mOwnerInfo.getPaddingBottom(); int expanded = mOwnerInfo.getBottom() + mOwnerInfo.getPaddingBottom();
int toRemove = (int) ((expanded - collapsed) * ratio); int toRemove = (int) ((expanded - collapsed) * ratio);
setBottom(getMeasuredHeight() - toRemove); setBottom(getMeasuredHeight() - toRemove);
if (mNotificationIcons != null) {
// We're using scrolling in order not to overload the translation which is used // We're using scrolling in order not to overload the translation which is used
// when appearing the icons // when appearing the icons
mNotificationIcons.setScrollY(toRemove); mNotificationIcons.setScrollY(toRemove);
} else { }
} else if (mNotificationIcons != null){
mNotificationIcons.setScrollY(0); mNotificationIcons.setScrollY(0);
} }
} }