From ebd4649bb25bf12aa984693dd503d7439e88dc16 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 01:35:20 +0000 Subject: [PATCH] am 0fcf19cd: am 7021cb02: Merge "Allow CoordinatorLayout to handle root level pkg" into mnc-ub-dev * commit '0fcf19cdbaabb79ed13568f3267cc6d827f94805': Allow CoordinatorLayout to handle root level pkg GitOrigin-RevId=3f787b7f9a4d67e423445fbcbbf983a5042737a4 PiperOrigin-RevId: 140550430 --- .../support/design/widget/CoordinatorLayout.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/android/support/design/widget/CoordinatorLayout.java b/src/android/support/design/widget/CoordinatorLayout.java index 165a07681..4b86b7c99 100644 --- a/src/android/support/design/widget/CoordinatorLayout.java +++ b/src/android/support/design/widget/CoordinatorLayout.java @@ -87,7 +87,12 @@ import java.util.Map; */ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParent { static final String TAG = "CoordinatorLayout"; - static final String WIDGET_PACKAGE_NAME = CoordinatorLayout.class.getPackage().getName(); + static final String WIDGET_PACKAGE_NAME; + + static { + final Package pkg = CoordinatorLayout.class.getPackage(); + WIDGET_PACKAGE_NAME = pkg != null ? pkg.getName() : null; + } private static final int TYPE_ON_INTERCEPT = 0; private static final int TYPE_ON_TOUCH = 1; @@ -503,8 +508,10 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen // Fully qualified package name. fullName = name; } else { - // Assume stock behavior in this package. - fullName = WIDGET_PACKAGE_NAME + '.' + name; + // Assume stock behavior in this package (if we have one) + fullName = !TextUtils.isEmpty(WIDGET_PACKAGE_NAME) + ? (WIDGET_PACKAGE_NAME + '.' + name) + : name; } try {