Merge "Cleanup: Remove unused padding arguments" (4291ea0c) · Commits · e / os / android_frameworks_base

core/java/android/text/StaticLayout.java

+2 −36

Original line number	Diff line number	Diff line
		@@ -124,8 +124,6 @@ public class StaticLayout extends Layout {
		b.mText = null;
		b.mLeftIndents = null;
		b.mRightIndents = null;
		b.mLeftPaddings = null;
		b.mRightPaddings = null;
		sPool.release(b);
		}

		@@ -135,8 +133,6 @@ public class StaticLayout extends Layout {
		mPaint = null;
		mLeftIndents = null;
		mRightIndents = null;
		mLeftPaddings = null;
		mRightPaddings = null;
		}

		public Builder setText(CharSequence source) {
		@@ -363,28 +359,6 @@ public class StaticLayout extends Layout {
		return this;
		}

		/**
		* Set available paddings to draw overhanging text on. Arguments are arrays holding the
		* amount of padding available, one per line, measured in pixels. For lines past the last
		* element in the array, the last element repeats.
		*
		* The individual padding amounts should be non-negative. The result of passing negative
		* paddings is undefined.
		*
		* @param leftPaddings array of amounts of available padding for left margin, in pixels
		* @param rightPaddings array of amounts of available padding for right margin, in pixels
		* @return this builder, useful for chaining
		*
		* @hide
		*/
		@NonNull
		public Builder setAvailablePaddings(@Nullable int[] leftPaddings,
		@Nullable int[] rightPaddings) {
		mLeftPaddings = leftPaddings;
		mRightPaddings = rightPaddings;
		return this;
		}

		/**
		* Set paragraph justification mode. The default value is
		* {@link Layout#JUSTIFICATION_MODE_NONE}. If the last line is too short for justification,
		@@ -445,8 +419,6 @@ public class StaticLayout extends Layout {
		private int mHyphenationFrequency;
		@Nullable private int[] mLeftIndents;
		@Nullable private int[] mRightIndents;
		@Nullable private int[] mLeftPaddings;
		@Nullable private int[] mRightPaddings;
		private int mJustificationMode;
		private boolean mAddLastLineLineSpacing;

		@@ -596,8 +568,6 @@ public class StaticLayout extends Layout {

		mLeftIndents = b.mLeftIndents;
		mRightIndents = b.mRightIndents;
		mLeftPaddings = b.mLeftPaddings;
		mRightPaddings = b.mRightPaddings;
		setJustificationMode(b.mJustificationMode);

		generate(b, b.mIncludePad, b.mIncludePad);
		@@ -649,7 +619,7 @@ public class StaticLayout extends Layout {
		b.mBreakStrategy, b.mHyphenationFrequency,
		// TODO: Support more justification mode, e.g. letter spacing, stretching.
		b.mJustificationMode != Layout.JUSTIFICATION_MODE_NONE,
		indents, mLeftPaddings, mRightPaddings);
		indents);

		PrecomputedText.ParagraphInfo[] paragraphInfo = null;
		final Spanned spanned = (source instanceof Spanned) ? (Spanned) source : null;
		@@ -1341,9 +1311,7 @@ public class StaticLayout extends Layout {
		@BreakStrategy int breakStrategy,
		@HyphenationFrequency int hyphenationFrequency,
		boolean isJustified,
		@Nullable int[] indents,
		@Nullable int[] leftPaddings,
		@Nullable int[] rightPaddings);
		@Nullable int[] indents);

		@CriticalNative
		private static native void nFinish(long nativePtr);
		@@ -1442,6 +1410,4 @@ public class StaticLayout extends Layout {

		@Nullable private int[] mLeftIndents;
		@Nullable private int[] mRightIndents;
		@Nullable private int[] mLeftPaddings;
		@Nullable private int[] mRightPaddings;
		}

core/jni/android_text_StaticLayout.cpp

+2 −7

Original line number	Diff line number	Diff line
		@@ -69,15 +69,12 @@ static inline minikin::android::StaticLayoutNative* toNative(jlong ptr) {
		// set text and set a number of parameters for creating a layout (width, tabstops, strategy,
		// hyphenFrequency)
		static jlong nInit(JNIEnv* env, jclass /* unused */,
		jint breakStrategy, jint hyphenationFrequency, jboolean isJustified,
		jintArray indents, jintArray leftPaddings, jintArray rightPaddings) {
		jint breakStrategy, jint hyphenationFrequency, jboolean isJustified, jintArray indents) {
		return reinterpret_cast<jlong>(new minikin::android::StaticLayoutNative(
		static_cast<minikin::BreakStrategy>(breakStrategy),
		static_cast<minikin::HyphenationFrequency>(hyphenationFrequency),
		isJustified,
		jintArrayToFloatVector(env, indents),
		jintArrayToFloatVector(env, leftPaddings),
		jintArrayToFloatVector(env, rightPaddings)));
		jintArrayToFloatVector(env, indents)));
		}

		// CriticalNative
		@@ -161,8 +158,6 @@ static const JNINativeMethod gMethods[] = {
		"I" // hyphenationFrequency
		"Z" // isJustified
		"[I" // indents
		"[I" // left paddings
		"[I" // right paddings
		")J", (void*) nInit},

		// Critical Natives