Commit 333ab36
authored
File tree
- tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -99,7 +99,7 @@ protected static int getDesiredHeight(View view) { | |||
| 99 | 99 | // We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL. | |
| 100 | 100 | @SuppressLint("RtlHardcoded") | |
| 101 | 101 | protected static void layoutChild(View child, int left, int top, int right, int bottom) { | |
| 102 | - if (child.getVisibility() == View.GONE) { | ||
| 102 | + if (child == null || child.getVisibility() == View.GONE) { | ||
| 103 | 103 | return; | |
| 104 | 104 | } | |
| 105 | 105 | ||
@@ -223,7 +223,7 @@ protected static void layoutChild(View child, int left, int top, int right, int | |||
| 223 | 223 | } | |
| 224 | 224 | ||
| 225 | 225 | protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) { | |
| 226 | - if (child.getVisibility() == View.GONE) { | ||
| 226 | + if (child == null || child.getVisibility() == View.GONE) { | ||
| 227 | 227 | return; | |
| 228 | 228 | } | |
| 229 | 229 | ||
0 commit comments