Merge "Removed warnings in DynamicLayout" into honeycomb (2a32a39e) · Commits · e / os / android_frameworks_base

core/java/android/text/DynamicLayout.java

+14 −23

Original line number	Diff line number	Diff line
		@@ -341,55 +341,47 @@ extends Layout
		}
		}

		private void dump(boolean show) {
		int n = getLineCount();

		for (int i = 0; i < n; i++) {
		System.out.print("line " + i + ": " + getLineStart(i) + " to " + getLineEnd(i) + " ");

		if (show) {
		System.out.print(getText().subSequence(getLineStart(i),
		getLineEnd(i)));
		}

		System.out.println("");
		}

		System.out.println("");
		}

		@Override
		public int getLineCount() {
		return mInts.size() - 1;
		}

		@Override
		public int getLineTop(int line) {
		return mInts.getValue(line, TOP);
		}

		@Override
		public int getLineDescent(int line) {
		return mInts.getValue(line, DESCENT);
		}

		@Override
		public int getLineStart(int line) {
		return mInts.getValue(line, START) & START_MASK;
		}

		@Override
		public boolean getLineContainsTab(int line) {
		return (mInts.getValue(line, TAB) & TAB_MASK) != 0;
		}

		@Override
		public int getParagraphDirection(int line) {
		return mInts.getValue(line, DIR) >> DIR_SHIFT;
		}

		@Override
		public final Directions getLineDirections(int line) {
		return mObjects.getValue(line, 0);
		}

		@Override
		public int getTopPadding() {
		return mTopPadding;
		}

		@Override
		public int getBottomPadding() {
		return mBottomPadding;
		}
		@@ -403,11 +395,11 @@ extends Layout
		implements TextWatcher, SpanWatcher
		{
		public ChangeWatcher(DynamicLayout layout) {
		mLayout = new WeakReference(layout);
		mLayout = new WeakReference<DynamicLayout>(layout);
		}

		private void reflow(CharSequence s, int where, int before, int after) {
		DynamicLayout ml = (DynamicLayout) mLayout.get();
		DynamicLayout ml = mLayout.get();

		if (ml != null)
		ml.reflow(s, where, before, after);
		@@ -417,7 +409,6 @@ extends Layout

		public void beforeTextChanged(CharSequence s,
		int where, int before, int after) {
		;
		}

		public void onTextChanged(CharSequence s,
		@@ -426,7 +417,6 @@ extends Layout
		}

		public void afterTextChanged(Editable s) {
		;
		}

		public void onSpanAdded(Spannable s, Object o, int start, int end) {
		@@ -447,9 +437,10 @@ extends Layout
		}
		}

		private WeakReference mLayout;
		private WeakReference<DynamicLayout> mLayout;
		}

		@Override
		public int getEllipsisStart(int line) {
		if (mEllipsizeAt == null) {
		return 0;
		@@ -458,6 +449,7 @@ extends Layout
		return mInts.getValue(line, ELLIPSIS_START);
		}

		@Override
		public int getEllipsisCount(int line) {
		if (mEllipsizeAt == null) {
		return 0;
		@@ -494,7 +486,6 @@ extends Layout
		private static final int COLUMNS_ELLIPSIZE = 5;

		private static final int START_MASK = 0x1FFFFFFF;
		private static final int DIR_MASK = 0xC0000000;
		private static final int DIR_SHIFT = 30;
		private static final int TAB_MASK = 0x20000000;