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

Commit b607d2c4 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am bad7eed8: Merge "Add removeRule() to RelativeLayout LayoutParams" into jb-mr1-dev

* commit 'bad7eed8':
  Add removeRule() to RelativeLayout LayoutParams
parents e0eb91e8 bad7eed8
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -28452,6 +28452,7 @@ package android.widget {
    method public void addRule(int, int);
    method public java.lang.String debug(java.lang.String);
    method public int[] getRules();
    method public void removeRule(int);
    field public boolean alignWithParent;
  }
+15 −0
Original line number Diff line number Diff line
@@ -1306,6 +1306,21 @@ public class RelativeLayout extends ViewGroup {
            mRulesChanged = true;
        }

        /**
         * Removes a layout rule to be interpreted by the RelativeLayout.
         *
         * @param verb One of the verbs defined by
         *        {@link android.widget.RelativeLayout RelativeLayout}, such as
         *         ALIGN_WITH_PARENT_LEFT.
         * @see #addRule(int)
         * @see #addRule(int, int)
         */
        public void removeRule(int verb) {
            mRules[verb] = 0;
            mInitialRules[verb] = 0;
            mRulesChanged = true;
        }

        private boolean hasRelativeRules() {
            return (mInitialRules[START_OF] != 0 || mInitialRules[END_OF] != 0 ||
                    mInitialRules[ALIGN_START] != 0 || mInitialRules[ALIGN_END] != 0 ||