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

Commit ed530f58 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Fix StaticLayout left/right indent" into nyc-dev am: 9dba546d 

am: bd0e4e7b

* commit 'bd0e4e7b':
  Fix StaticLayout left/right indent

Change-Id: Ifae9bda90c76eb7f34690e8bea21d5e3f2b8f116
parents eaa0a72a bd0e4e7b

core/java/android/text/StaticLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -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 :