summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Siyamed Sinir <siyamed@google.com> 2016-04-13 17:29:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-04-13 17:29:22 +0000
commit9dba546d9aec4668b2b97cd15dc6fb35bc95ece6 (patch)
tree1426f23b88ca6050c6114914bf62a39524887890
parenta184abe4b0348b7c4633fb2c9922d2ec82cee34a (diff)
parentf9a0886da0bddcb7db84b46bfee0129acc8276b8 (diff)
Merge "Fix StaticLayout left/right indent" into nyc-dev
-rw-r--r--core/java/android/text/StaticLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 94ce57ac7cb9..239f2d0c89b2 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -683,7 +683,7 @@ public class StaticLayout extends Layout {
// 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 :