From 072a0e00687e9e74bc11a22fe3411ef941739419 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Mon, 17 Jul 2023 12:20:42 +0000 Subject: [PATCH] Revert "Fix lock pattern is truncated during SUW in folded state" This reverts commit a2e032bb8efc7df06a443d431ae4640b3f5b16b2. Reason for revert: b/290721507 Change-Id: Ifaaecde6c168ebe22d3b2245df1fd5b0a9c1b8c2 --- .../settings/password/SetupChooseLockPattern.java | 6 ------ .../settings/password/SetupChooseLockPatternTest.java | 9 --------- 2 files changed, 15 deletions(-) diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 4424b4f6c2d..2cad1813568 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -90,12 +90,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; } diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index 2f469867d0d..c5e08137863 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -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();