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

Commit b0e88dbb authored by Maurice Lam's avatar Maurice Lam
Browse files

Make "minimal" pattern layout sw320dp 

The minimal layout was sw400dp, but some smaller phones still have
enough space to display the icon and button decently, so we're
reducing the trigger threshold for the "minimal" layout to sw320dp.

Test: m -j RunSettingsRoboTests
Bug: 74527018
Change-Id: Ibfca1828870058301cca302554ce3d932c8ba70b
parent 8a022d86

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

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public class ChooseLockPatternTest { 
        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);

    }



    @Config(qualifiers = "sw300dp")

    @Test

    public void smallScreens_shouldHideIcon() {

        ChooseLockPattern activity = createActivity(true);

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

+2 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.password;



import static com.google.common.truth.Truth.assertThat;



import static org.robolectric.RuntimeEnvironment.application;



import android.app.Activity;
@@ -46,10 +47,6 @@ import org.robolectric.annotation.Config; 
import org.robolectric.shadows.ShadowAlertDialog;

import org.robolectric.shadows.ShadowPackageManager;

import org.robolectric.util.ReflectionHelpers;

import org.robolectric.util.ReflectionHelpers.ClassParameter;



import java.util.Collections;

import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(shadows = {
@@ -89,7 +86,6 @@ public class SetupChooseLockPatternTest { 
        assertThat(componentEnabled).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);

    }



    @Config(qualifiers = "sw400dp")

    @Test

    public void selectPattern_shouldHideOptionsButton() {

        Button button = mActivity.findViewById(R.id.screen_lock_options);
@@ -114,6 +110,7 @@ public class SetupChooseLockPatternTest { 
        assertThat(count).named("List items shown").isEqualTo(3);

    }



    @Config(qualifiers = "sw300dp")

    @Test

    public void smallScreens_shouldHideScreenLockOptions() {

        Button button = mActivity.findViewById(R.id.screen_lock_options);