sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Caesar2011
2019-02-06 12:05:32 +01:00
parent c589889db4 31850e100d
commit 123da07d35
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/de/sebse/fuplanner/tools/ui/cardview/ExpandableCardView.java
View File

@@ -134,7 +134,7 @@ public class ExpandableCardView extends CardView {
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
if (outerView != null || innerView != null) {
if (outerView == null || innerView == null) {
log.w("This should not happen (onLayout)! Inner views are null!", innerView, outerView);
return;
}
@@ -161,7 +161,7 @@ public class ExpandableCardView extends CardView {
setMeasuredDimension(reconcileSize(10, widthMeasureSpec), reconcileSize(10, heightMeasureSpec));
return;
}
if (outerView != null || innerView != null) {
if (outerView == null || innerView == null) {
log.w("This should not happen (onMeasure)! Inner views are null!", innerView, outerView);
setMeasuredDimension(reconcileSize(10, widthMeasureSpec), reconcileSize(10, heightMeasureSpec));
return;
@@ -375,4 +375,3 @@ public class ExpandableCardView extends CardView {
}