Fix a crash when setting vertical gear location and content view null

When setting the vertical location of the gear we need the collapsed
height of the parent, the parent might not be fully laid out so move
setting the vertical location into onLayout instead

Bug: 28390732
Change-Id: I7c1bf14a54e9f1ef0a693fa13e1a6533f5967631
This commit is contained in:
Mady Mellor
2016-04-26 11:01:03 -07:00
parent a0676c9207
commit a6edc87829
2 changed files with 3 additions and 1 deletions

View File

@@ -1123,6 +1123,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
updateMaxHeights();
if (mSettingsIconRow != null) {
mSettingsIconRow.updateVerticalLocation();
}
}
private void updateMaxHeights() {

View File

@@ -244,7 +244,6 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC
}
public void setIconLocation(boolean onLeft) {
updateVerticalLocation();
if ((mIconPlaced && onLeft == mOnLeft) || mSnapping || mParent == null
|| mGearIcon.getWidth() == 0) {
// Do nothing