Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev (c23c6164) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/password/SetupChooseLockPattern.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -94,12 +94,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
		}
		// Show the skip button during SUW but not during Settings > Biometric Enrollment
		mSkipOrClearButton.setOnClickListener(this::onSkipOrClearButtonClick);

		final View headerView = view.findViewById(R.id.sud_layout_header);
		final ViewGroup.MarginLayoutParams lp =
		(ViewGroup.MarginLayoutParams) headerView.getLayoutParams();
		lp.bottomMargin = 0;
		view.setLayoutParams(lp);
		return view;
		}

+0 −9

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.res.Resources;
		import android.os.UserHandle;
		import android.util.TypedValue;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.Button;
		import android.widget.TextView;

		@@ -115,14 +114,6 @@ public class SetupChooseLockPatternTest {
		assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
		}

		@Test
		public void headerView_noBottomMargin() {
		final View header = mActivity.findViewById(R.id.sud_layout_header);
		final ViewGroup.MarginLayoutParams lp =
		(ViewGroup.MarginLayoutParams) header.getLayoutParams();
		assertThat(lp.bottomMargin).isEqualTo(0);
		}

		private void verifyScreenLockOptionsShown() {
		final Button button = mActivity.findViewById(R.id.screen_lock_options);
		assertThat(button).isNotNull();