diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a6a85d3b390..8d742fa5cd5 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -78,7 +78,7 @@
android:gravity="center"
style="@style/TextAppearance.PasswordEntry"/>
-
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index f841391620c..46e2516459d 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -85,7 +85,7 @@
android:orientation="vertical">
+ android:icon="@drawable/ic_lock">
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/res/layout/face_enroll_enrolling.xml b/res/layout/face_enroll_enrolling.xml
index 7aef9b654e7..38a26a2683e 100644
--- a/res/layout/face_enroll_enrolling.xml
+++ b/res/layout/face_enroll_enrolling.xml
@@ -57,7 +57,7 @@
-
-
-
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 6ca3fdc6e78..4439b08c3b7 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -77,7 +77,7 @@
-
-
-
-
-
-
-
-
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 060ba1d4dad..881d3ca5a6e 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -15,7 +15,6 @@
-->
- - @*android:layout/preference_category_material
- @layout/confirm_lock_pattern_base
- @layout/confirm_lock_pattern_normal_base
- @layout/confirm_lock_password_base
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 15ec46d01b4..9a72ff5f8a3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -174,23 +174,6 @@
- #ff000000
-
-
-
-
-
-
-
-
-
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 8cae26b831f..656b18c3919 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -40,6 +40,8 @@ import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.ButtonFooterMixin;
import com.google.android.setupdesign.GlifLayout;
import java.util.List;
@@ -86,11 +88,8 @@ public class EncryptionInterstitial extends SettingsActivity {
layout.setFitsSystemWindows(false);
}
- public static class EncryptionInterstitialFragment extends InstrumentedFragment
- implements View.OnClickListener {
+ public static class EncryptionInterstitialFragment extends InstrumentedFragment {
- private View mRequirePasswordToDecrypt;
- private View mDontRequirePasswordToDecrypt;
private boolean mPasswordRequired;
private Intent mUnlockMethodIntent;
private int mRequestedPasswordQuality;
@@ -110,8 +109,6 @@ public class EncryptionInterstitial extends SettingsActivity {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mRequirePasswordToDecrypt = view.findViewById(R.id.encrypt_require_password);
- mDontRequirePasswordToDecrypt = view.findViewById(R.id.encrypt_dont_require_password);
final boolean forFingerprint = getActivity().getIntent().getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
final boolean forFace = getActivity().getIntent()
@@ -147,14 +144,30 @@ public class EncryptionInterstitial extends SettingsActivity {
TextView message = (TextView) getActivity().findViewById(R.id.encryption_message);
message.setText(msgId);
- mRequirePasswordToDecrypt.setOnClickListener(this);
- mDontRequirePasswordToDecrypt.setOnClickListener(this);
-
setRequirePasswordState(getActivity().getIntent().getBooleanExtra(
EXTRA_REQUIRE_PASSWORD, true));
GlifLayout layout = (GlifLayout) view;
layout.setHeaderText(getActivity().getTitle());
+
+ final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
+ buttonFooterMixin.setSecondaryButton(
+ new FooterButton.Builder(getContext())
+ .setText(R.string.encryption_interstitial_no)
+ .setListener(this::onNoButtonClicked)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
+ );
+
+ buttonFooterMixin.setPrimaryButton(
+ new FooterButton.Builder(getContext())
+ .setText(R.string.encryption_interstitial_yes)
+ .setListener(this::onYesButtonClicked)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
+ );
}
protected void startLockIntent() {
@@ -176,26 +189,25 @@ public class EncryptionInterstitial extends SettingsActivity {
}
}
- @Override
- public void onClick(View view) {
- if (view == mRequirePasswordToDecrypt) {
- final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
- if (accEn && !mPasswordRequired) {
- setRequirePasswordState(false); // clear the UI state
- AccessibilityWarningDialogFragment.newInstance(mRequestedPasswordQuality)
- .show(
- getChildFragmentManager(),
- AccessibilityWarningDialogFragment.TAG);
- } else {
- setRequirePasswordState(true);
- startLockIntent();
- }
+ private void onYesButtonClicked(View view) {
+ final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
+ if (accEn && !mPasswordRequired) {
+ setRequirePasswordState(false); // clear the UI state
+ AccessibilityWarningDialogFragment.newInstance(mRequestedPasswordQuality)
+ .show(
+ getChildFragmentManager(),
+ AccessibilityWarningDialogFragment.TAG);
} else {
- setRequirePasswordState(false);
+ setRequirePasswordState(true);
startLockIntent();
}
}
+ private void onNoButtonClicked(View view) {
+ setRequirePasswordState(false);
+ startLockIntent();
+ }
+
private void setRequirePasswordState(boolean required) {
mPasswordRequired = required;
}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 61a247dd38a..e4ce644304b 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -419,12 +419,12 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.setPrimaryButton(
- new FooterButton(
- getActivity(),
- R.string.master_clear_button_text,
- mInitiateListener,
- ButtonType.OTHER,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(getActivity())
+ .setText(R.string.master_clear_button_text)
+ .setListener(mInitiateListener)
+ .setButtonType(ButtonType.OTHER)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
mInitiateButton = buttonFooterMixin.getPrimaryButton();
}
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index b2bf838cfbf..0750cb14b98 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -156,12 +156,12 @@ public class MasterClearConfirm extends InstrumentedFragment {
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.setPrimaryButton(
- new FooterButton(
- getActivity(),
- R.string.master_clear_button_text,
- mFinalClickListener,
- ButtonType.OTHER,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(getActivity())
+ .setText(R.string.master_clear_button_text)
+ .setListener(mFinalClickListener)
+ .setButtonType(ButtonType.OTHER)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
index 8cc71336fa0..ec75266bcc6 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
@@ -93,12 +93,12 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.security_settings_face_enroll_enrolling_skip,
- this::onSkipButtonClick,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_face_enroll_enrolling_skip)
+ .setListener(this::onSkipButtonClick)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_DIVERSITY, true)) {
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
index f0ff5234ebe..afd6f55f1ad 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
@@ -39,12 +39,12 @@ public class FaceEnrollFinish extends BiometricEnrollBase {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setPrimaryButton(
- new FooterButton(
- this,
- R.string.security_settings_face_enroll_done,
- this::onNextButtonClick,
- FooterButton.ButtonType.NEXT,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_face_enroll_done)
+ .setListener(this::onNextButtonClick)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index a90cf5d9249..93118100c26 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -62,21 +62,21 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.security_settings_face_enroll_introduction_cancel,
- this::onCancelButtonClick,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_face_enroll_introduction_cancel)
+ .setListener(this::onCancelButtonClick)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
mButtonFooterMixin.setPrimaryButton(
- new FooterButton(
- this,
- R.string.wizard_next,
- this::onNextButtonClick,
- FooterButton.ButtonType.NEXT,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(this)
+ .setText(R.string.wizard_next)
+ .setListener(this::onNextButtonClick)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 5953c10e500..88e1c6a137f 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -139,12 +139,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.security_settings_fingerprint_enroll_enrolling_skip,
- this::onSkipButtonClick,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
+ .setListener(this::onSkipButtonClick)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
final LayerDrawable fingerprintDrawable = (LayerDrawable) mProgressBar.getBackground();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index b8a0f40834e..1b97d19e5dd 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -49,12 +49,12 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
setContentView(getContentView());
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.skip_label,
- this::onSkipButtonClick,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.skip_label)
+ .setListener(this::onSkipButtonClick)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 76f1d1fa033..db7d92ea679 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -44,21 +44,20 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.fingerprint_enroll_button_add,
- null,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.fingerprint_enroll_button_add)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
mButtonFooterMixin.setPrimaryButton(
- new FooterButton(
- this,
- R.string.security_settings_fingerprint_enroll_done,
- this::onNextButtonClick,
- FooterButton.ButtonType.NEXT,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_fingerprint_enroll_done)
+ .setListener(this::onNextButtonClick)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 4eca87d4bf9..1ad11e30a73 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -49,21 +49,21 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.security_settings_face_enroll_introduction_cancel,
- this::onCancelButtonClick,
- FooterButton.ButtonType.SKIP,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.security_settings_face_enroll_introduction_cancel)
+ .setListener(this::onCancelButtonClick)
+ .setButtonType(FooterButton.ButtonType.SKIP)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
mButtonFooterMixin.setPrimaryButton(
- new FooterButton(
- this,
- R.string.wizard_next,
- this::onNextButtonClick,
- FooterButton.ButtonType.NEXT,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(this)
+ .setText(R.string.wizard_next)
+ .setListener(this::onNextButtonClick)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 9950d3ffaa0..4d6ded15b6c 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -96,20 +96,20 @@ public abstract class StorageWizardBase extends FragmentActivity {
mButtonFooterMixin = getGlifLayout().getMixin(ButtonFooterMixin.class);
mButtonFooterMixin.setSecondaryButton(
- new FooterButton(
- this,
- R.string.wizard_back,
- this::onNavigateBack,
- FooterButton.ButtonType.OTHER,
- R.style.SuwGlifButton_Secondary)
+ new FooterButton.Builder(this)
+ .setText(R.string.wizard_back)
+ .setListener(this::onNavigateBack)
+ .setButtonType(FooterButton.ButtonType.OTHER)
+ .setTheme(R.style.SuwGlifButton_Secondary)
+ .build()
);
mButtonFooterMixin.setPrimaryButton(
- new FooterButton(
- this,
- R.string.wizard_next,
- this::onNavigateNext,
- FooterButton.ButtonType.NEXT,
- R.style.SuwGlifButton_Primary)
+ new FooterButton.Builder(this)
+ .setText(R.string.wizard_next)
+ .setListener(this::onNavigateNext)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
);
mBack = mButtonFooterMixin.getSecondaryButton();
mNext = mButtonFooterMixin.getPrimaryButton();
diff --git a/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java b/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java
index 1f1630e3ec5..2b61ec8d522 100644
--- a/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java
@@ -53,7 +53,7 @@ public class WakeLockScreenGesturePreferenceController extends GesturePreference
@Override
public int getAvailabilityStatus() {
// No hardware support for this Gesture
- if (!getAmbientConfig().wakeLockScreenGestureAvailable()) {
+ if (!getAmbientConfig().wakeScreenGestureAvailable()) {
return UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 32dc52db113..b2f2d25f2b4 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -32,7 +32,6 @@ import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@@ -46,9 +45,12 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupdesign.GlifLayout;
+
public class RedactionInterstitial extends SettingsActivity {
@Override
@@ -91,7 +93,7 @@ public class RedactionInterstitial extends SettingsActivity {
}
public static class RedactionInterstitialFragment extends SettingsPreferenceFragment
- implements RadioGroup.OnCheckedChangeListener, View.OnClickListener {
+ implements RadioGroup.OnCheckedChangeListener {
private RadioGroup mRadioGroup;
private RestrictedRadioButton mShowAllButton;
@@ -130,19 +132,24 @@ public class RedactionInterstitial extends SettingsActivity {
((RadioButton) view.findViewById(R.id.hide_all)).setVisibility(View.GONE);
}
- final Button button = (Button) view.findViewById(R.id.redaction_done_button);
- button.setOnClickListener(this);
+ final GlifLayout layout = view.findViewById(R.id.setup_wizard_layout);
+ final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
+ buttonFooterMixin.setPrimaryButton(
+ new FooterButton.Builder(getContext())
+ .setText(R.string.app_notifications_dialog_done)
+ .setListener(this::onDoneButtonClicked)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SuwGlifButton_Primary)
+ .build()
+ );
}
- @Override
- public void onClick(View v) {
- if (v.getId() == R.id.redaction_done_button) {
- SetupRedactionInterstitial.setEnabled(getContext(), false);
- final RedactionInterstitial activity = (RedactionInterstitial) getActivity();
- if (activity != null) {
- activity.setResult(RESULT_OK, null);
- finish();
- }
+ private void onDoneButtonClicked(View view) {
+ SetupRedactionInterstitial.setEnabled(getContext(), false);
+ final RedactionInterstitial activity = (RedactionInterstitial) getActivity();
+ if (activity != null) {
+ activity.setResult(RESULT_OK, null);
+ finish();
}
}
diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java
index 10a3d908611..cd213511503 100644
--- a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java
@@ -71,7 +71,7 @@ public class WakeLockScreenGesturePreferenceControllerTest {
@Test
public void getAvailabilityStatus_gestureNotSupported_UNSUPPORTED_ON_DEVICE() {
- when(mAmbientDisplayConfiguration.wakeLockScreenGestureAvailable()).thenReturn(false);
+ when(mAmbientDisplayConfiguration.wakeScreenGestureAvailable()).thenReturn(false);
final int availabilityStatus = mController.getAvailabilityStatus();
assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);
@@ -79,7 +79,7 @@ public class WakeLockScreenGesturePreferenceControllerTest {
@Test
public void getAvailabilityStatus_gestureSupported_AVAILABLE() {
- when(mAmbientDisplayConfiguration.wakeLockScreenGestureAvailable()).thenReturn(true);
+ when(mAmbientDisplayConfiguration.wakeScreenGestureAvailable()).thenReturn(true);
final int availabilityStatus = mController.getAvailabilityStatus();
assertThat(availabilityStatus).isEqualTo(AVAILABLE);
diff --git a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
index 9a6b754ceea..3b4abfe64cb 100644
--- a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
+++ b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
@@ -35,6 +35,9 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest;
import androidx.test.runner.AndroidJUnit4;
+import com.google.android.setupcompat.PartnerCustomizationLayout;
+import com.google.android.setupcompat.template.ButtonFooterMixin;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -63,10 +66,11 @@ public class EncryptionInterstitialTest {
@Test
public void clickYes_shouldRequirePassword() {
- mInstrumentation.startActivitySync(
+ final Activity activity = mInstrumentation.startActivitySync(
new Intent(mContext, EncryptionInterstitial.class)
.putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent")));
- onView(withId(R.id.encrypt_require_password)).perform(click());
+ final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+ layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView().performClick();
mActivityMonitor.waitForActivityWithTimeout(1000);
assertEquals(1, mActivityMonitor.getHits());
@@ -77,10 +81,11 @@ public class EncryptionInterstitialTest {
@Test
public void clickNo_shouldNotRequirePassword() {
- mInstrumentation.startActivitySync(
+ final Activity activity = mInstrumentation.startActivitySync(
new Intent(mContext, EncryptionInterstitial.class)
.putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent")));
- onView(withId(R.id.encrypt_dont_require_password)).perform(click());
+ final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+ layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().performClick();
mActivityMonitor.waitForActivityWithTimeout(1000);
assertEquals(1, mActivityMonitor.getHits());