PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev

Browse Source
This commit is contained in:
Shawn Lin
2023-07-18 03:18:12 +00:00
committed by Android (Google) Code Review
parent e414d40e60 072a0e0068
commit c23c6164bb
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/password/SetupChooseLockPattern.java
View File

@@ -94,12 +94,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
} }
// Show the skip button during SUW but not during Settings > Biometric Enrollment // Show the skip button during SUW but not during Settings > Biometric Enrollment
mSkipOrClearButton.setOnClickListener(this::onSkipOrClearButtonClick); 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; return view;
} }

9
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
View File

@@ -28,7 +28,6 @@ import android.content.res.Resources;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
@@ -115,14 +114,6 @@ public class SetupChooseLockPatternTest {
assertThat(button.getVisibility()).isEqualTo(View.VISIBLE); 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() { private void verifyScreenLockOptionsShown() {
final Button button = mActivity.findViewById(R.id.screen_lock_options); final Button button = mActivity.findViewById(R.id.screen_lock_options);
assertThat(button).isNotNull(); assertThat(button).isNotNull();