Merge "Improve View layoutDirection resolution" (0adcd07c) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -23474,6 +23474,7 @@ package android.view {
		method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);
		method public void resetResolvedLayoutDirection();
		method public void resetResolvedTextDirection();
		method public void resolveLayoutDirection();
		method public void resolvePadding();
		method public static int resolveSize(int, int);
		method public static int resolveSizeAndState(int, int, int);

core/java/android/view/View.java

+12 −16

Original line number	Diff line number	Diff line
		@@ -4954,7 +4954,10 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		@ViewDebug.IntToString(from = LAYOUT_DIRECTION_RTL, to = "RESOLVED_DIRECTION_RTL")
		})
		public int getResolvedLayoutDirection() {
		resolveLayoutDirectionIfNeeded();
		// The layout diretion will be resolved only if needed
		if ((mPrivateFlags2 & LAYOUT_DIRECTION_RESOLVED) != LAYOUT_DIRECTION_RESOLVED) {
		resolveLayoutDirection();
		}
		return ((mPrivateFlags2 & LAYOUT_DIRECTION_RESOLVED_RTL) == LAYOUT_DIRECTION_RESOLVED_RTL) ?
		LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR;
		}
		@@ -9831,7 +9834,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		jumpDrawablesToCurrentState();
		// Order is important here: LayoutDirection MUST be resolved before Padding
		// and TextDirection
		resolveLayoutDirectionIfNeeded();
		resolveLayoutDirection();
		resolvePadding();
		resolveTextDirection();
		if (isFocused()) {
		@@ -9862,31 +9865,24 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		/**
		* 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.
		* Will call {@link View#onResolvedLayoutDirectionChanged} when resolution is done.
		*/
		private void resolveLayoutDirectionIfNeeded() {
		// Do not resolve if it is not needed
		if ((mPrivateFlags2 & LAYOUT_DIRECTION_RESOLVED) == LAYOUT_DIRECTION_RESOLVED) return;

		public void resolveLayoutDirection() {
		// Clear any previous layout direction resolution
		mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED_MASK;

		// Set resolved depending on layout direction
		switch (getLayoutDirection()) {
		case LAYOUT_DIRECTION_INHERIT:
		// We cannot do the resolution if there is no parent
		if (mParent == null) return;

		// If this is root view, no need to look at parent's layout dir.
		if (mParent instanceof ViewGroup) {
		if (canResolveLayoutDirection()) {
		ViewGroup viewGroup = ((ViewGroup) mParent);

		// Check if the parent view group can resolve
		if (! viewGroup.canResolveLayoutDirection()) {
		return;
		}
		if (viewGroup.getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED_RTL;
		}
		} else {
		// Nothing to do, LTR by default
		}
		break;
		case LAYOUT_DIRECTION_RTL:
		@@ -9989,7 +9985,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		public boolean canResolveLayoutDirection() {
		switch (getLayoutDirection()) {
		case LAYOUT_DIRECTION_INHERIT:
		return (mParent != null);
		return (mParent != null) && (mParent instanceof ViewGroup);
		default:
		return true;
		}
		@@ -14571,7 +14567,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		* {@link #TEXT_DIRECTION_LOCALE},
		*/
		public int getResolvedTextDirection() {
		// The text direction is not inherited so return it back
		// The text direction will be resolved only if needed
		if ((mPrivateFlags2 & TEXT_DIRECTION_RESOLVED) != TEXT_DIRECTION_RESOLVED) {
		resolveTextDirection();
		}