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

Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev am: f733b7b0ff am: de251cc896

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23737990

Change-Id: Id6bc8a4b0545fb21f339d1eccf1c131c375de82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lin
2023-06-29 05:04:44 +00:00
committed by Automerger Merge Worker
parent 1fd4ecb4c3 de251cc896
commit 1c112249f3
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,12 @@ 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;
}

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

@@ -28,6 +28,7 @@ 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;
@@ -114,6 +115,14 @@ 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();