Merge "Update carrier label margin in setDisplayCutout" into main (7d5a0d22) · Commits · e / os / android_frameworks_base

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

+12 −7

Original line number	Diff line number	Diff line
		@@ -182,14 +182,8 @@ public class KeyguardStatusBarView extends RelativeLayout {
		mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
		getResources().getDimensionPixelSize(
		com.android.internal.R.dimen.text_size_small_material));
		lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams();
		updateCarrierLabelMargin();

		int marginStart = calculateMargin(
		getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin),
		mPadding.left);
		lp.setMarginStart(marginStart);

		mCarrierLabel.setLayoutParams(lp);
		updateKeyguardStatusBarHeight();
		}

		@@ -203,6 +197,15 @@ public class KeyguardStatusBarView extends RelativeLayout {
		setLayoutParams(lp);
		}

		private void updateCarrierLabelMargin() {
		MarginLayoutParams lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams();
		int marginStart = calculateMargin(
		getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin),
		mPadding.left);
		lp.setMarginStart(marginStart);
		mCarrierLabel.setLayoutParams(lp);
		}

		void loadDimens() {
		Resources res = getResources();
		mSystemIconsSwitcherHiddenExpandedMargin = res.getDimensionPixelSize(
		@@ -334,6 +337,7 @@ public class KeyguardStatusBarView extends RelativeLayout {

		RelativeLayout.LayoutParams lp = (LayoutParams) mCarrierLabel.getLayoutParams();
		lp.addRule(RelativeLayout.START_OF, R.id.status_icon_area);
		updateCarrierLabelMargin();

		lp = (LayoutParams) mStatusIconArea.getLayoutParams();
		lp.removeRule(RelativeLayout.RIGHT_OF);
		@@ -366,6 +370,7 @@ public class KeyguardStatusBarView extends RelativeLayout {

		lp = (LayoutParams) mCarrierLabel.getLayoutParams();
		lp.addRule(RelativeLayout.START_OF, R.id.cutout_space_view);
		updateCarrierLabelMargin();

		lp = (LayoutParams) mStatusIconArea.getLayoutParams();
		lp.addRule(RelativeLayout.RIGHT_OF, R.id.cutout_space_view);