summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-08-19 15:41:51 -0700
committer Alan Viverette <alanv@google.com> 2014-08-19 15:41:51 -0700
commit567e44797bca5fd12beb213b90d25cd40b55c8db (patch)
treeb936e2c8a97b0a59fe43deba8d63ad3bc2c29228
parent9e4329ea0b8b725ca5bcec74032b765d01deaa80 (diff)
Fix alignParentRight/End in RelativeLayout
BUG: 17136816 Change-Id: If7edb2e0216384429f4caf7e9aae01c09ddd8be4
-rw-r--r--core/java/android/widget/RelativeLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 4dd7e0793b22..23f911c94f43 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -1501,7 +1501,7 @@ public class RelativeLayout extends ViewGroup {
mRules[ALIGN_PARENT_START] = 0;
}
- if (mRules[ALIGN_PARENT_RIGHT] == 0) {
+ if (mRules[ALIGN_PARENT_END] != 0) {
if (mRules[ALIGN_PARENT_RIGHT] == 0) {
// "right" rule is not defined but "end" rule is: use the "end" rule as the
// "right" rule