Merge "Update ViewLocationHolder#compareTo to properly implement Comparable" (ab4bb06b) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+3 −12

Original line number	Diff line number	Diff line
		@@ -6939,13 +6939,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		if (getClass() != another.getClass()) {
		return 1;
		}
		// First is above second.
		if (mLocation.bottom - another.mLocation.top <= 0) {
		return -1;
		}
		// First is below second.
		if (mLocation.top - another.mLocation.bottom >= 0) {
		return 1;
		final int topDiference = mLocation.top - another.mLocation.top;
		if (topDiference != 0) {
		return topDiference;
		}
		// LTR
		if (mLayoutDirection == LAYOUT_DIRECTION_LTR) {
		@@ -6961,11 +6957,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		return -rightDifference;
		}
		}
		// Break tie by top.
		final int topDiference = mLocation.top - another.mLocation.top;
		if (topDiference != 0) {
		return topDiference;
		}
		// Break tie by height.
		final int heightDiference = mLocation.height() - another.mLocation.height();
		if (heightDiference != 0) {