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

Commit 0e404ee8 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I540233d2c45f5f8b079a630df3ccb59cf6e818c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f4b3fdc c23c6164

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;

        }

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

+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();