commit ebf2d44b5ef136271b6e17d91df7f8ac36a8f453
author Chris Banes <chrisbanes@google.com> Tue Oct 20 08:55:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 20 08:55:57 2015 +0000
tree 861a16f3dbb788ff5938bf8e411db94ce52e427a
parent 4daf2f0ac0fbc992c384a39cef2b05f159420710
parent 375995f4dc8aecb335bb262190d2cd39fdb136d6

Merge "Don't let a View anchor itself to it's parent CoordinatorLayout" into mnc-ub-dev

design/src/android/support/design/widget/CoordinatorLayout.java

diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index 7338a3a..3d16ac9 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -2461,9 +2461,18 @@
          * Determine the anchor view for the child view this LayoutParams is assigned to.
          * Assumes mAnchorId is valid.
          */
-        private void resolveAnchorView(View forChild, CoordinatorLayout parent) {
+        private void resolveAnchorView(final View forChild, final CoordinatorLayout parent) {
             mAnchorView = parent.findViewById(mAnchorId);
             if (mAnchorView != null) {
+                if (mAnchorView == parent) {
+                    if (parent.isInEditMode()) {
+                        mAnchorView = mAnchorDirectChild = null;
+                        return;
+                    }
+                    throw new IllegalStateException(
+                            "View can not be anchored to the the parent CoordinatorLayout");
+                }
+
                 View directChild = mAnchorView;
                 for (ViewParent p = mAnchorView.getParent();
                         p != parent && p != null;