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 
am: ffb7b7feff

Change-Id: Ic33597abd76a9d3250022223f72ced6871197ad1
This commit is contained in:
Selim Cinek
2019-06-12 13:29:39 -07:00
committed by android-build-merger
parent 1c7e6d9307 ffb7b7feff
commit 0c6aeb6b4e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 toRemove = (int) ((expanded - collapsed) * ratio);
setBottom(getMeasuredHeight() - toRemove);
// We're using scrolling in order not to overload the translation which is used
// when appearing the icons
mNotificationIcons.setScrollY(toRemove);
} else {
if (mNotificationIcons != null) {
// We're using scrolling in order not to overload the translation which is used
// when appearing the icons
mNotificationIcons.setScrollY(toRemove);
}
} else if (mNotificationIcons != null){
mNotificationIcons.setScrollY(0);
}
}