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

Merge "Make "minimal" pattern layout sw320dp" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-20 03:30:42 +00:00
committed by Android (Google) Code Review
parent 39b54ea1f8 b0e88dbbfe
commit b98eea4c67
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);