Merge "Fix pattern rotation header text." into udc-d1-dev

This commit is contained in:
Hao Dong
2023-06-29 23:52:00 +00:00
committed by Android (Google) Code Review
2 changed files with 27 additions and 13 deletions

View File

@@ -18,12 +18,15 @@ package com.android.settings.password;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment.KEY_UI_STAGE;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.view.View;
@@ -34,6 +37,8 @@ import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.google.android.setupdesign.GlifLayout;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -119,6 +124,21 @@ public class ChooseLockPatternTest {
assertThat(flags & FLAG_SECURE).isEqualTo(FLAG_SECURE);
}
@Test
public void headerText_stageConfirmWrong() {
ChooseLockPattern activity = createActivity(true);
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content);
final GlifLayout layout = fragment.getView().findViewById(R.id.setup_wizard_layout);
Bundle savedInstanceState = new Bundle();
savedInstanceState.putInt(KEY_UI_STAGE,
ChooseLockPatternFragment.Stage.ConfirmWrong.ordinal());
fragment.onViewCreated(layout, savedInstanceState);
assertThat(layout.getHeaderText().toString()).isEqualTo(activity.getResources().getString(
R.string.lockpassword_draw_your_pattern_again_header));
}
private ChooseLockPattern createActivity(boolean addFingerprintExtra) {
return Robolectric.buildActivity(
ChooseLockPattern.class,