Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c112249 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix lock pattern is truncated during SUW in folded state" into... 

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

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



Change-Id: Id6bc8a4b0545fb21f339d1eccf1c131c375de82d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1fd4ecb4 de251cc8

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

+6 −0
Original line number Diff line number Diff line
@@ -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;

        }

tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java

+9 −0
Original line number Diff line number Diff line
@@ -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();