Merge "Fix RTL in StatusIconContainer" (6fae5ba6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,8 @@ public class StatusIconContainer extends AlphaOptimizedLinearLayout {
		* Layout is happening from end -> start
		*/
		private void calculateIconTranslations() {
		float translationX = getWidth();
		float width = getWidth();
		float translationX = width;
		float contentStart = getPaddingStart();
		int childCount = getChildCount();
		// Underflow === don't show content until that index
		@@ -133,6 +134,15 @@ public class StatusIconContainer extends AlphaOptimizedLinearLayout {
		}
		}
		}

		// Stole this from NotificationIconContainer. Not optimal but keeps the layout logic clean
		if (isLayoutRtl()) {
		for (int i = 0; i < childCount; i++) {
		View child = getChildAt(i);
		ViewState state = getViewStateFromChild(child);
		state.xTranslation = width - state.xTranslation - child.getWidth();
		}
		}
		}

		private void applyIconStates() {