commit 9dba546d9aec4668b2b97cd15dc6fb35bc95ece6
author Siyamed Sinir <siyamed@google.com> Wed Apr 13 17:29:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 17:29:22 2016 +0000
tree 1426f23b88ca6050c6114914bf62a39524887890
parent a184abe4b0348b7c4633fb2c9922d2ec82cee34a
parent f9a0886da0bddcb7db84b46bfee0129acc8276b8

Merge "Fix StaticLayout left/right indent" into nyc-dev

core/java/android/text/StaticLayout.java

diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 94ce57a..239f2d0 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -683,7 +683,7 @@
                 // interface.
                 int leftLen = mLeftIndents == null ? 0 : mLeftIndents.length;
                 int rightLen = mRightIndents == null ? 0 : mRightIndents.length;
-                int indentsLen = Math.max(1, Math.min(leftLen, rightLen) - mLineCount);
+                int indentsLen = Math.max(1, Math.max(leftLen, rightLen) - mLineCount);
                 int[] indents = new int[indentsLen];
                 for (int i = 0; i < indentsLen; i++) {
                     int leftMargin = mLeftIndents == null ? 0 :