Skip to content

chore: merge release to master #7276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manoldonev merged 3 commits into from
May 22, 2019
Merged

chore: merge release to master #7276

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
333ab36
fix(android): CommonLayoutParams measure/layout child guard (#7271)
manoldonev May 22, 2019
30f6e2a
Merge branch 'master' into mdonev/release-to-master7271
manoldonev May 22, 2019
3b23067
Merge branch 'master' into mdonev/release-to-master7271
manoldonev May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...es-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ protected static int getDesiredHeight(View view) {
// 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;
}

Expand Down Expand Up @@ -223,7 +223,7 @@ protected static void layoutChild(View child, int left, int top, int right, int
}

protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
if (child.getVisibility() == View.GONE) {
if (child == null || child.getVisibility() == View.GONE) {
return;
}

Expand Down