Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev (88427b0c) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -138,6 +138,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
	updateBrightnessControllerState();		updateBrightnessControllerState();
	updateZTranslation();		updateZTranslation();
	updateClickTargets();		updateClickTargets();
			updateWidth();
	if (mQSPanel != null) {		if (mQSPanel != null) {
	mQSPanel.setExpanded(expanded && !overscrolled);		mQSPanel.setExpanded(expanded && !overscrolled);
	}		}
	@@ -173,7 +174,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
	}		}

	private void updateWidth() {		private void updateWidth() {
	int width = mKeyguardShowing ? mKeyguardWidth : mNormalWidth;		int width = (mKeyguardShowing && !mExpanded) ? mKeyguardWidth : mNormalWidth;
	ViewGroup.LayoutParams lp = getLayoutParams();		ViewGroup.LayoutParams lp = getLayoutParams();
	if (width != lp.width) {		if (width != lp.width) {
	lp.width = width;		lp.width = width;