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

Merge "Add a done button to vision setting pages in setup flow"

Browse Source
This commit is contained in:
Menghan Li
2023-02-14 03:09:12 +00:00
committed by Android (Google) Code Review
parent a733c64a58 dd2ec775c8
commit 42e131a199
11 changed files with 119 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
View File

@@ -23,6 +23,7 @@ import static com.android.settings.accessibility.AccessibilitySettingsForSetupWi
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -45,6 +46,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settingslib.RestrictedPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
import org.junit.Before;
@@ -79,6 +81,8 @@ public class AccessibilitySettingsForSetupWizardTest {
private FragmentActivity mActivity;
@Mock
private GlifPreferenceLayout mGlifLayoutView;
@Mock
private FooterBarMixin mFooterBarMixin;
private AccessibilitySettingsForSetupWizard mFragment;
@Before
@@ -89,6 +93,7 @@ public class AccessibilitySettingsForSetupWizardTest {
when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(
mAccessibilityServices);
doReturn(mActivity).when(mFragment).getActivity();
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
}
@Test
@@ -99,6 +104,7 @@ public class AccessibilitySettingsForSetupWizardTest {
mContext.getString(R.string.vision_settings_title));
verify(mGlifLayoutView).setDescriptionText(
mContext.getString(R.string.vision_settings_description));
verify(mFooterBarMixin).setPrimaryButton(any());
}
@Test

13
tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java
View File

@@ -100,19 +100,10 @@ public class TextReadingPreferenceFragmentForSetupWizardTest {
}
@Test
public void onViewCreated_verifySetSecondaryButton() {
mFragment.onViewCreated(mGlifLayoutView, null);
verify(mFooterBarMixin).setSecondaryButton(any());
}
@Test
public void onViewCreated_verifySetPrimaryButton() {
doReturn(mActivity).when(mFragment).getActivity();
doReturn("setupwizard").when(mActivity).getCallingPackage();
public void onViewCreated_verifyAction() {
mFragment.onViewCreated(mGlifLayoutView, null);
verify(mFooterBarMixin).setPrimaryButton(any());
verify(mFooterBarMixin).setSecondaryButton(any());
}
}

6
tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -38,6 +39,7 @@ import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settingslib.widget.TopIntroPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
import org.junit.Before;
@@ -64,6 +66,8 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest {
private GlifPreferenceLayout mGlifLayoutView;
@Mock
private SettingsMainSwitchBar mSwitchBar;
@Mock
private FooterBarMixin mFooterBarMixin;
private ToggleScreenMagnificationPreferenceFragmentForSetupWizard mFragment;
@Before
@@ -72,6 +76,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest {
spy(new TestToggleScreenMagnificationPreferenceFragmentForSetupWizard(mContext));
doReturn(mActivity).when(mFragment).getActivity();
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
}
@Test
@@ -83,6 +88,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest {
verify(mGlifLayoutView).setDescriptionText(
mContext.getString(R.string.accessibility_screen_magnification_intro_text));
verify(mGlifLayoutView).setDividerInsets(Integer.MAX_VALUE, 0);
verify(mFooterBarMixin).setPrimaryButton(any());
assertThat(mFragment.mTopIntroPreference.isVisible()).isFalse();
assertThat(mFragment.mSettingsPreference.isVisible()).isFalse();
assertThat(mFragment.mFollowingTypingSwitchPreference.isVisible()).isFalse();

6
tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -37,6 +38,7 @@ import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.TopIntroPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
import org.junit.Before;
@@ -62,6 +64,8 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizardTest {
private GlifPreferenceLayout mGlifLayoutView;
@Mock
private SettingsMainSwitchBar mSwitchBar;
@Mock
private FooterBarMixin mFooterBarMixin;
private ToggleScreenReaderPreferenceFragmentForSetupWizard mFragment;
@Before
@@ -69,6 +73,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizardTest {
mFragment = spy(new TestToggleScreenReaderPreferenceFragmentForSetupWizard(mContext));
doReturn(mActivity).when(mFragment).getActivity();
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
}
@Test
@@ -79,6 +84,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizardTest {
verify(mGlifLayoutView).setDescriptionText(
mContext.getString(R.string.talkback_summary));
verify(mGlifLayoutView).setDividerInsets(Integer.MAX_VALUE, 0);
verify(mFooterBarMixin).setPrimaryButton(any());
assertThat(mFragment.mTopIntroPreference.isVisible()).isFalse();
}

6
tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -37,6 +38,7 @@ import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.TopIntroPreference;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifPreferenceLayout;
import org.junit.Before;
@@ -62,6 +64,8 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest {
private GlifPreferenceLayout mGlifLayoutView;
@Mock
private SettingsMainSwitchBar mSwitchBar;
@Mock
private FooterBarMixin mFooterBarMixin;
private ToggleSelectToSpeakPreferenceFragmentForSetupWizard mFragment;
@Before
@@ -69,6 +73,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest {
mFragment = spy(new TestToggleSelectToSpeakPreferenceFragmentForSetupWizard(mContext));
doReturn(mActivity).when(mFragment).getActivity();
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
}
@Test
@@ -79,6 +84,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest {
verify(mGlifLayoutView).setDescriptionText(
mContext.getString(R.string.select_to_speak_summary));
verify(mGlifLayoutView).setDividerInsets(Integer.MAX_VALUE, 0);
verify(mFooterBarMixin).setPrimaryButton(any());
assertThat(mFragment.mTopIntroPreference.isVisible()).isFalse();
}