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

Merge "Fixed a crash when the heads up content view was null" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-04-22 03:22:12 +00:00
committed by Android (Google) Code Review
parent 8f32cd4306 8ea2d5f72d
commit 841e4946bf
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -834,11 +834,15 @@ public class NotificationContentView extends FrameLayout {
public void updateExpandButtons(boolean expandable) { public void updateExpandButtons(boolean expandable) {
mExpandable = expandable; mExpandable = expandable;
// if the expanded child has the same height as the collapsed one we hide it. // if the expanded child has the same height as the collapsed one we hide it.
if (mExpandedChild != null && mExpandedChild.getHeight() != 0 && if (mExpandedChild != null && mExpandedChild.getHeight() != 0) {
((mIsHeadsUp && mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) || if ((!mIsHeadsUp || mHeadsUpChild == null)) {
(!mIsHeadsUp && mExpandedChild.getHeight() == mContractedChild.getHeight()))) { if (mExpandedChild.getHeight() == mContractedChild.getHeight()) {
expandable = false; expandable = false;
} }
} else if (mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) {
expandable = false;
}
}
if (mExpandedChild != null) { if (mExpandedChild != null) {
mExpandedWrapper.updateExpandability(expandable, mExpandClickListener); mExpandedWrapper.updateExpandability(expandable, mExpandClickListener);
} }