Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 980d12b1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 838 into donut 

* changes:
  Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
parents d8593312 8a342a3c

core/java/android/widget/SlidingDrawer.java

+6 −1
Original line number Diff line number Diff line
@@ -206,10 +206,15 @@ public class SlidingDrawer extends ViewGroup { 


        int contentId = a.getResourceId(R.styleable.SlidingDrawer_content, 0);

        if (contentId == 0) {

            throw new IllegalArgumentException("The handle attribute is required and must refer "

            throw new IllegalArgumentException("The content attribute is required and must refer "

                    + "to a valid child.");

        }



        if (handleId == contentId) {

            throw new IllegalArgumentException("The content and handle attributes must refer "

                    + "to different children.");

        }



        mHandleId = handleId;

        mContentId = contentId;