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

[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446

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

Change-Id: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
This commit is contained in:
Curtis Belmonte
2021-08-16 21:44:39 +00:00
committed by Presubmit Automerger Backend
parent 1f7d2deea8 dc9b53c446
commit 5cf728d2fc
5 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -404,18 +404,6 @@ public class ChooseLockPasswordTest {
"Must be fewer than 17 characters");
}
@Test
public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {
ShadowDrawable drawable = setActivityAndGetIconDrawable(true);
assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
}
@Test
public void assertThat_chooseLockIconNotChanged_WhenFingerprintExtraSet() {
ShadowDrawable drawable = setActivityAndGetIconDrawable(false);
assertThat(drawable.getCreatedFromResId()).isNotEqualTo(R.drawable.ic_fingerprint_header);
}
@Test
public void validateComplexityMergedFromDpmOnCreate() {
ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);

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

@@ -31,9 +31,6 @@ import com.android.settings.R;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.testutils.DrawableTestHelper;
import com.google.android.setupdesign.GlifLayout;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -99,16 +96,6 @@ public class ChooseLockPatternTest {
.isNotNull();
}
@Config(qualifiers = "sw400dp")
@Test
public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {
ChooseLockPattern activity = createActivity(true);
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content);
DrawableTestHelper.assertDrawableResId(((GlifLayout) fragment.getView()).getIcon(),
R.drawable.ic_fingerprint_header);
}
@Config(qualifiers = "sw300dp")
@Test
public void smallScreens_shouldHideIcon() {