Remove/replace old fingerprint icon in SUW/Settings
Replaces instances of the old fingerprint icon shown during Setup Wizard or in Settings with either an updated version or an entirely different icon. Test: Manual Fixes: 196600265 Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
This commit is contained in:
@@ -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);
|
||||
|
@@ -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() {
|
||||
|
Reference in New Issue
Block a user