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

Merge "Rename ButtonFooterMixin to FooterBarMixin"

Browse Source
This commit is contained in:
Pasty Chang
2019-01-25 03:58:56 +00:00
committed by Android (Google) Code Review
parent a4118f8e27 9bdb59a764
commit 0c6e676708
30 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
View File

@@ -38,7 +38,7 @@ import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.ScrollToParentEditText;
import com.google.android.setupcompat.PartnerCustomizationLayout;
import com.google.android.setupcompat.template.ButtonFooterMixin;
import com.google.android.setupcompat.template.FooterBarMixin;
import org.junit.After;
import org.junit.Before;
@@ -142,7 +142,7 @@ public class SetupChooseLockPasswordTest {
final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
final Button skipOrClearButton =
layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView();
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipOrClearButton).isNotNull();
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
@@ -165,7 +165,7 @@ public class SetupChooseLockPasswordTest {
final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
final Button skipOrClearButton =
layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView();
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipOrClearButton.isEnabled()).isTrue();
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.GONE);

8
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
View File

@@ -41,7 +41,7 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.google.android.setupcompat.PartnerCustomizationLayout;
import com.google.android.setupcompat.template.ButtonFooterMixin;
import com.google.android.setupcompat.template.FooterBarMixin;
import org.junit.Before;
import org.junit.Test;
@@ -148,7 +148,7 @@ public class SetupChooseLockPatternTest {
public void skipButton_shouldBeVisible_duringNonFingerprintFlow() {
PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
final Button skipOrClearButton =
layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView();
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipOrClearButton).isNotNull();
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
@@ -163,7 +163,7 @@ public class SetupChooseLockPatternTest {
PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
final Button skipOrClearButton =
layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView();
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(skipOrClearButton.isEnabled()).isTrue();
@@ -177,7 +177,7 @@ public class SetupChooseLockPatternTest {
PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
final Button skipOrClearButton =
layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView();
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(skipOrClearButton.isEnabled()).isTrue();
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(skipOrClearButton.getText())