javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): CommonLayoutParams measure/layout child guard (#7271)

Browse Source
This commit is contained in:
Manol Donev
2019-05-22 14:54:44 +03:00
committed by GitHub
parent 0aca08755a
commit 333ab36593
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
View File

@@ -99,7 +99,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
// 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.
@SuppressLint("RtlHardcoded")
protected static void layoutChild(View child, int left, int top, int right, int bottom) {
if (child.getVisibility() == View.GONE) {
if (child == null || child.getVisibility() == View.GONE) {
return;
}
@@ -223,7 +223,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
}
protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
if (child.getVisibility() == View.GONE) {
if (child == null || child.getVisibility() == View.GONE) {
return;
}