From b0e88dbbfe31736e11f53c5f5cd5b8b4a931da0c Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 16 Mar 2018 16:26:42 -0700
Subject: [PATCH] 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
---
 res/{values-sw400dp => values-sw320dp}/config.xml          | 0
 .../android/settings/password/ChooseLockPatternTest.java   | 1 +
 .../settings/password/SetupChooseLockPatternTest.java      | 7 ++-----
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename res/{values-sw400dp => values-sw320dp}/config.xml (100%)

diff --git a/res/values-sw400dp/config.xml b/res/values-sw320dp/config.xml
similarity index 100%
rename from res/values-sw400dp/config.xml
rename to res/values-sw320dp/config.xml
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index c63f1c283f2..e07351cd34a 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -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);
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index ab08a9011fe..a98db11c0ba 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -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);