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

Make "minimal" pattern layout sw320dp

Browse Source 
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
This commit is contained in:
Maurice Lam
2018-03-16 16:26:42 -07:00
parent 8a022d8693
commit b0e88dbbfe
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/values-sw400dp/config.xml → res/values-sw320dp/config.xml
View File

1
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -107,6 +107,7 @@ public class ChooseLockPatternTest {
assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header); assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
} }
@Config(qualifiers = "sw300dp")
@Test @Test
public void smallScreens_shouldHideIcon() { public void smallScreens_shouldHideIcon() {
ChooseLockPattern activity = createActivity(true); ChooseLockPattern activity = createActivity(true);

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

@@ -17,6 +17,7 @@
package com.android.settings.password; package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
import android.app.Activity; import android.app.Activity;
@@ -46,10 +47,6 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAlertDialog; import org.robolectric.shadows.ShadowAlertDialog;
import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
import org.robolectric.util.ReflectionHelpers.ClassParameter;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = { @Config(shadows = {
@@ -89,7 +86,6 @@ public class SetupChooseLockPatternTest {
assertThat(componentEnabled).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); assertThat(componentEnabled).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
} }
@Config(qualifiers = "sw400dp")
@Test @Test
public void selectPattern_shouldHideOptionsButton() { public void selectPattern_shouldHideOptionsButton() {
Button button = mActivity.findViewById(R.id.screen_lock_options); Button button = mActivity.findViewById(R.id.screen_lock_options);
@@ -114,6 +110,7 @@ public class SetupChooseLockPatternTest {
assertThat(count).named("List items shown").isEqualTo(3); assertThat(count).named("List items shown").isEqualTo(3);
} }
@Config(qualifiers = "sw300dp")
@Test @Test
public void smallScreens_shouldHideScreenLockOptions() { public void smallScreens_shouldHideScreenLockOptions() {
Button button = mActivity.findViewById(R.id.screen_lock_options); Button button = mActivity.findViewById(R.id.screen_lock_options);