Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev (669aa7cb) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -25042,7 +25042,6 @@ package android.view {
		method public boolean isInEditMode();
		method public boolean isInTouchMode();
		method public boolean isLayoutRequested();
		method public boolean isLayoutRtl();
		method public boolean isLongClickable();
		method public boolean isOpaque();
		method protected boolean isPaddingOffsetRequired();

core/java/android/view/View.java

+80 −58

Original line number	Diff line number	Diff line
		@@ -5887,6 +5887,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* layout attribute and/or the inherited value from the parent
		*
		* @return true if the layout is right-to-left.
		*
		* @hide
		*/
		@ViewDebug.ExportedProperty(category = "layout")
		public boolean isLayoutRtl() {
		@@ -11628,9 +11630,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* Resolve and cache the layout direction. LTR is set initially. This is implicitly supposing
		* that the parent directionality can and will be resolved before its children.
		*
		* @return true if resolution has been done, false otherwise.
		*
		* @hide
		*/
		public void resolveLayoutDirection() {
		public boolean resolveLayoutDirection() {
		// Clear any previous layout direction resolution
		mPrivateFlags2 &= ~PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK;

		@@ -11641,15 +11645,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		case LAYOUT_DIRECTION_INHERIT:
		// We cannot resolve yet. LTR is by default and let the resolution happen again
		// later to get the correct resolved value
		if (!canResolveLayoutDirection()) return;
		if (!canResolveLayoutDirection()) return false;

		ViewGroup viewGroup = ((ViewGroup) mParent);
		View parent = ((View) mParent);
		// Parent has not yet resolved, LTR is still the default
		if (!parent.isLayoutDirectionResolved()) return false;

		// We cannot resolve yet on the parent too. LTR is by default and let the
		// resolution happen again later
		if (!viewGroup.canResolveLayoutDirection()) return;

		if (viewGroup.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		if (parent.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		mPrivateFlags2 \|= PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL;
		}
		break;
		@@ -11669,6 +11671,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		// Set to resolved
		mPrivateFlags2 \|= PFLAG2_LAYOUT_DIRECTION_RESOLVED;
		return true;
		}

		/**
		@@ -11679,10 +11682,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @hide
		*/
		public boolean canResolveLayoutDirection() {
		switch ((mPrivateFlags2 & PFLAG2_LAYOUT_DIRECTION_MASK) >>
		PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) {
		switch (getRawLayoutDirection()) {
		case LAYOUT_DIRECTION_INHERIT:
		return (mParent != null) && (mParent instanceof ViewGroup);
		return (mParent != null) && (mParent instanceof ViewGroup) &&
		((ViewGroup) mParent).canResolveLayoutDirection();
		default:
		return true;
		}
		@@ -16640,9 +16643,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		/**
		* Resolve the text direction.
		*
		* @return true if resolution has been done, false otherwise.
		*
		* @hide
		*/
		public void resolveTextDirection() {
		public boolean resolveTextDirection() {
		// Reset any previous text direction resolution
		mPrivateFlags2 &= ~(PFLAG2_TEXT_DIRECTION_RESOLVED \| PFLAG2_TEXT_DIRECTION_RESOLVED_MASK);

		@@ -16651,11 +16656,23 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		final int textDirection = getRawTextDirection();
		switch(textDirection) {
		case TEXT_DIRECTION_INHERIT:
		if (canResolveTextDirection()) {
		ViewGroup viewGroup = ((ViewGroup) mParent);
		if (!canResolveTextDirection()) {
		// We cannot do the resolution if there is no parent, so use the default one
		mPrivateFlags2 \|= PFLAG2_TEXT_DIRECTION_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return false;
		}

		View parent = ((View) mParent);
		// Parent has not yet resolved, so we still return the default
		if (!parent.isTextDirectionResolved()) {
		mPrivateFlags2 \|= PFLAG2_TEXT_DIRECTION_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return false;
		}

		// Set current resolved direction to the same value as the parent's one
		final int parentResolvedDirection = viewGroup.getTextDirection();
		final int parentResolvedDirection = parent.getTextDirection();
		switch (parentResolvedDirection) {
		case TEXT_DIRECTION_FIRST_STRONG:
		case TEXT_DIRECTION_ANY_RTL:
		@@ -16669,12 +16686,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		// Default resolved direction is "first strong" heuristic
		mPrivateFlags2 \|= PFLAG2_TEXT_DIRECTION_RESOLVED_DEFAULT;
		}
		} else {
		// We cannot do the resolution if there is no parent, so use the default one
		mPrivateFlags2 \|= PFLAG2_TEXT_DIRECTION_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return;
		}
		break;
		case TEXT_DIRECTION_FIRST_STRONG:
		case TEXT_DIRECTION_ANY_RTL:
		@@ -16695,6 +16706,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		// Set to resolved
		mPrivateFlags2 \|= PFLAG2_TEXT_DIRECTION_RESOLVED;
		return true;
		}

		/**
		@@ -16705,7 +16717,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		private boolean canResolveTextDirection() {
		switch (getRawTextDirection()) {
		case TEXT_DIRECTION_INHERIT:
		return (mParent != null) && (mParent instanceof ViewGroup);
		return (mParent != null) && (mParent instanceof View) &&
		((View) mParent).canResolveTextDirection();
		default:
		return true;
		}
		@@ -16835,9 +16848,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		/**
		* Resolve the text alignment.
		*
		* @return true if resolution has been done, false otherwise.
		*
		* @hide
		*/
		public void resolveTextAlignment() {
		public boolean resolveTextAlignment() {
		// Reset any previous text alignment resolution
		mPrivateFlags2 &= ~(PFLAG2_TEXT_ALIGNMENT_RESOLVED \| PFLAG2_TEXT_ALIGNMENT_RESOLVED_MASK);

		@@ -16847,10 +16862,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		switch (textAlignment) {
		case TEXT_ALIGNMENT_INHERIT:
		// Check if we can resolve the text alignment
		if (canResolveTextAlignment() && mParent instanceof View) {
		View view = (View) mParent;
		if (!canResolveTextAlignment()) {
		// We cannot do the resolution if there is no parent so use the default
		mPrivateFlags2 \|= PFLAG2_TEXT_ALIGNMENT_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return false;
		}
		View parent = (View) mParent;

		final int parentResolvedTextAlignment = view.getTextAlignment();
		// Parent has not yet resolved, so we still return the default
		if (!parent.isTextAlignmentResolved()) {
		mPrivateFlags2 \|= PFLAG2_TEXT_ALIGNMENT_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return false;
		}

		final int parentResolvedTextAlignment = parent.getTextAlignment();
		switch (parentResolvedTextAlignment) {
		case TEXT_ALIGNMENT_GRAVITY:
		case TEXT_ALIGNMENT_TEXT_START:
		@@ -16867,13 +16894,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		// Use default resolved text alignment
		mPrivateFlags2 \|= PFLAG2_TEXT_ALIGNMENT_RESOLVED_DEFAULT;
		}
		}
		else {
		// We cannot do the resolution if there is no parent so use the default
		mPrivateFlags2 \|= PFLAG2_TEXT_ALIGNMENT_RESOLVED_DEFAULT;
		// Resolution will need to happen again later
		return;
		}
		break;
		case TEXT_ALIGNMENT_GRAVITY:
		case TEXT_ALIGNMENT_TEXT_START:
		@@ -16895,6 +16915,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		// Set the resolved
		mPrivateFlags2 \|= PFLAG2_TEXT_ALIGNMENT_RESOLVED;
		return true;
		}

		/**
		@@ -16905,7 +16926,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		private boolean canResolveTextAlignment() {
		switch (getRawTextAlignment()) {
		case TEXT_DIRECTION_INHERIT:
		return (mParent != null);
		return (mParent != null) && (mParent instanceof View) &&
		((View) mParent).canResolveTextAlignment();
		default:
		return true;
		}

core/java/android/view/ViewGroup.java

+35 −24

Original line number	Diff line number	Diff line
		@@ -3382,6 +3382,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		ai.mKeepScreenOn = lastKeepOn;
		}

		if (child.isLayoutDirectionInherited()) {
		child.resetResolvedLayoutDirection();
		child.resolveRtlPropertiesIfNeeded();
		}

		onViewAdded(child);

		if ((child.mViewFlags & DUPLICATE_PARENT_STATE) == DUPLICATE_PARENT_STATE) {
		@@ -5256,9 +5261,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @hide
		*/
		@Override
		public void resolveLayoutDirection() {
		super.resolveLayoutDirection();

		public boolean resolveLayoutDirection() {
		final boolean result = super.resolveLayoutDirection();
		if (result) {
		int count = getChildCount();
		for (int i = 0; i < count; i++) {
		final View child = getChildAt(i);
		@@ -5267,14 +5272,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}
		}
		return result;
		}

		/**
		* @hide
		*/
		@Override
		public void resolveTextDirection() {
		super.resolveTextDirection();

		public boolean resolveTextDirection() {
		final boolean result = super.resolveTextDirection();
		if (result) {
		int count = getChildCount();
		for (int i = 0; i < count; i++) {
		final View child = getChildAt(i);
		@@ -5283,14 +5290,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}
		}
		return result;
		}

		/**
		* @hide
		*/
		@Override
		public void resolveTextAlignment() {
		super.resolveTextAlignment();

		public boolean resolveTextAlignment() {
		final boolean result = super.resolveTextAlignment();
		if (result) {
		int count = getChildCount();
		for (int i = 0; i < count; i++) {
		final View child = getChildAt(i);
		@@ -5299,6 +5308,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}
		}
		return result;
		}

		/**
		* @hide