commit 4d4596aae8fb381f55b7f6f0fbcd82839b6262b5
author Roozbeh Pournader <roozbeh@google.com> Thu Jul 13 18:35:09 2017 -0700
committer Roozbeh Pournader <roozbeh@google.com> Thu Jul 13 19:11:05 2017 -0700
tree c05299f065db356af61d49885ef189c716794a39
parent 1137f872c6e4ee0b2f630cd03f5b4f0033368115

Fix calculation of RelativeLayout width in RTL mode

Fixes: 37035671
Test: Manual
Test: bit CtsWidgetTestCases:.RelativeLayoutTest
Change-Id: I82feecdba7d1ed1198580758ab1f68932bb50aa7

core/java/android/widget/RelativeLayout.java

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 33e6521..75fc538 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -486,7 +486,7 @@
                         if (targetSdkVersion < Build.VERSION_CODES.KITKAT) {
                             width = Math.max(width, myWidth - params.mLeft);
                         } else {
-                            width = Math.max(width, myWidth - params.mLeft - params.leftMargin);
+                            width = Math.max(width, myWidth - params.mLeft + params.leftMargin);
                         }
                     } else {
                         if (targetSdkVersion < Build.VERSION_CODES.KITKAT) {