Add a done button to vision setting pages in setup flow
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work. Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit5e931b2c23
and commitdd2ec775c8
. Bug: 262995569 Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286 Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286 (cherry picked from commitdd2ec775c8
)
This commit is contained in:
@@ -0,0 +1,198 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.AccessibilitySettingsForSetupWizard.SCREEN_READER_PACKAGE_NAME;
|
||||
import static com.android.settings.accessibility.AccessibilitySettingsForSetupWizard.SCREEN_READER_SERVICE_NAME;
|
||||
import static com.android.settings.accessibility.AccessibilitySettingsForSetupWizard.SELECT_TO_SPEAK_PACKAGE_NAME;
|
||||
import static com.android.settings.accessibility.AccessibilitySettingsForSetupWizard.SELECT_TO_SPEAK_SERVICE_NAME;
|
||||
|
||||
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;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.accessibilityservice.AccessibilityServiceInfo;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.pm.ServiceInfo;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
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;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Tests for {@link AccessibilitySettingsForSetupWizard}.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class AccessibilitySettingsForSetupWizardTest {
|
||||
|
||||
private static final ComponentName TEST_SCREEN_READER_COMPONENT_NAME = new ComponentName(
|
||||
SCREEN_READER_PACKAGE_NAME, SCREEN_READER_SERVICE_NAME);
|
||||
private static final ComponentName TEST_SELECT_TO_SPEAK_COMPONENT_NAME = new ComponentName(
|
||||
SELECT_TO_SPEAK_PACKAGE_NAME, SELECT_TO_SPEAK_SERVICE_NAME);
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private final List<AccessibilityServiceInfo> mAccessibilityServices = new ArrayList<>();
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private AccessibilityManager mAccessibilityManager;
|
||||
@Mock
|
||||
private FragmentActivity mActivity;
|
||||
@Mock
|
||||
private GlifPreferenceLayout mGlifLayoutView;
|
||||
@Mock
|
||||
private FooterBarMixin mFooterBarMixin;
|
||||
private AccessibilitySettingsForSetupWizard mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mFragment = spy(new TestAccessibilitySettingsForSetupWizard(mContext));
|
||||
doReturn(mAccessibilityManager).when(mActivity).getSystemService(
|
||||
AccessibilityManager.class);
|
||||
when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(
|
||||
mAccessibilityServices);
|
||||
doReturn(mActivity).when(mFragment).getActivity();
|
||||
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewCreated_verifyAction() {
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
|
||||
verify(mGlifLayoutView).setHeaderText(
|
||||
mContext.getString(R.string.vision_settings_title));
|
||||
verify(mGlifLayoutView).setDescriptionText(
|
||||
mContext.getString(R.string.vision_settings_description));
|
||||
verify(mFooterBarMixin).setPrimaryButton(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onResume_accessibilityServiceListInstalled_returnExpectedValue() {
|
||||
addEnabledServiceInfo(TEST_SCREEN_READER_COMPONENT_NAME, true);
|
||||
addEnabledServiceInfo(TEST_SELECT_TO_SPEAK_COMPONENT_NAME, true);
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
|
||||
mFragment.onResume();
|
||||
|
||||
assertRestrictedPreferenceMatch(mFragment.mScreenReaderPreference,
|
||||
TEST_SCREEN_READER_COMPONENT_NAME.getPackageName(),
|
||||
TEST_SCREEN_READER_COMPONENT_NAME.flattenToString());
|
||||
assertRestrictedPreferenceMatch(mFragment.mSelectToSpeakPreference,
|
||||
TEST_SELECT_TO_SPEAK_COMPONENT_NAME.getPackageName(),
|
||||
TEST_SELECT_TO_SPEAK_COMPONENT_NAME.flattenToString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onResume_accessibilityServiceListNotInstalled_returnNull() {
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
|
||||
mFragment.onResume();
|
||||
|
||||
assertThat(mFragment.mScreenReaderPreference.getKey()).isNull();
|
||||
assertThat(mFragment.mSelectToSpeakPreference.getKey()).isNull();
|
||||
}
|
||||
|
||||
private void addEnabledServiceInfo(ComponentName componentName, boolean isAccessibilityTool) {
|
||||
final AccessibilityServiceInfo a11yServiceInfo = mock(AccessibilityServiceInfo.class);
|
||||
when(a11yServiceInfo.getComponentName()).thenReturn(componentName);
|
||||
when(a11yServiceInfo.isAccessibilityTool()).thenReturn(isAccessibilityTool);
|
||||
final ResolveInfo resolveInfo = mock(ResolveInfo.class);
|
||||
when(a11yServiceInfo.getResolveInfo()).thenReturn(resolveInfo);
|
||||
resolveInfo.serviceInfo = mock(ServiceInfo.class);
|
||||
resolveInfo.serviceInfo.packageName = componentName.getPackageName();
|
||||
resolveInfo.serviceInfo.name = componentName.getClassName();
|
||||
when(resolveInfo.loadLabel(mActivity.getPackageManager())).thenReturn(
|
||||
componentName.getPackageName());
|
||||
mAccessibilityServices.add(a11yServiceInfo);
|
||||
}
|
||||
|
||||
private void assertRestrictedPreferenceMatch(RestrictedPreference preference, String title,
|
||||
String key) {
|
||||
assertThat(preference.getTitle().toString()).isEqualTo(title);
|
||||
assertThat(preference.getKey()).isEqualTo(key);
|
||||
assertThat(preference.getExtras().getString(AccessibilitySettings.EXTRA_TITLE))
|
||||
.isEqualTo(title);
|
||||
assertThat(preference.getExtras().getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY))
|
||||
.isEqualTo(key);
|
||||
}
|
||||
|
||||
private static class TestAccessibilitySettingsForSetupWizard
|
||||
extends AccessibilitySettingsForSetupWizard {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceManager mPreferenceManager;
|
||||
|
||||
TestAccessibilitySettingsForSetupWizard(Context context) {
|
||||
super();
|
||||
mContext = context;
|
||||
mPreferenceManager = new PreferenceManager(context);
|
||||
mPreferenceManager.setPreferences(mPreferenceManager.createPreferenceScreen(context));
|
||||
mDisplayMagnificationPreference = new Preference(context);
|
||||
mScreenReaderPreference = new RestrictedPreference(context);
|
||||
mSelectToSpeakPreference = new RestrictedPreference(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPreferenceScreenResId() {
|
||||
return R.xml.placeholder_prefs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceManager.getPreferenceScreen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPreferenceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
}
|
||||
}
|
@@ -18,51 +18,68 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.TextReadingPreferenceFragment.RESET_KEY;
|
||||
|
||||
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;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
import com.google.android.setupcompat.template.FooterBarMixin;
|
||||
import com.google.android.setupdesign.GlifPreferenceLayout;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/**
|
||||
* Tests for {@link TextReadingPreferenceFragmentForSetupWizard}.
|
||||
*/
|
||||
/** Tests for {@link TextReadingPreferenceFragmentForSetupWizard}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TextReadingPreferenceFragmentForSetupWizardTest {
|
||||
|
||||
private final Context mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
@Rule
|
||||
public final MockitoRule mMockito = MockitoJUnit.rule();
|
||||
|
||||
@Mock
|
||||
private GlifPreferenceLayout mGlifLayoutView;
|
||||
|
||||
@Mock
|
||||
private FooterBarMixin mFooterBarMixin;
|
||||
|
||||
@Mock
|
||||
private FragmentActivity mActivity;
|
||||
|
||||
@Spy
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private TextReadingPreferenceFragmentForSetupWizard mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mFragment = spy(new TextReadingPreferenceFragmentForSetupWizard());
|
||||
final LayoutPreference resetPreference =
|
||||
new LayoutPreference(mContext, R.layout.accessibility_text_reading_reset_button);
|
||||
doReturn(mContext).when(mFragment).getContext();
|
||||
doReturn(resetPreference).when(mFragment).findPreference(RESET_KEY);
|
||||
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setHeaderText_onViewCreated_verifyAction() {
|
||||
final String title = "title";
|
||||
doReturn(mContext).when(mFragment).getContext();
|
||||
doReturn(title).when(mContext).getString(
|
||||
R.string.accessibility_text_reading_options_title);
|
||||
|
||||
@@ -70,4 +87,23 @@ public class TextReadingPreferenceFragmentForSetupWizardTest {
|
||||
|
||||
verify(mGlifLayoutView).setHeaderText(title);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getMetricsCategory_returnsCorrectCategory() {
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(
|
||||
SettingsEnums.SUW_ACCESSIBILITY_TEXT_READING_OPTIONS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHelpResource_shouldNotHaveHelpResource() {
|
||||
assertThat(mFragment.getHelpResource()).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewCreated_verifyAction() {
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
|
||||
verify(mFooterBarMixin).setPrimaryButton(any());
|
||||
verify(mFooterBarMixin).setSecondaryButton(any());
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,144 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
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;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
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;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
/** Tests for {@link ToggleScreenMagnificationPreferenceFragmentForSetupWizard}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowSettingsPreferenceFragment.class})
|
||||
public class ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest {
|
||||
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private SettingsActivity mActivity;
|
||||
@Mock
|
||||
private GlifPreferenceLayout mGlifLayoutView;
|
||||
@Mock
|
||||
private SettingsMainSwitchBar mSwitchBar;
|
||||
@Mock
|
||||
private FooterBarMixin mFooterBarMixin;
|
||||
private ToggleScreenMagnificationPreferenceFragmentForSetupWizard mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mFragment =
|
||||
spy(new TestToggleScreenMagnificationPreferenceFragmentForSetupWizard(mContext));
|
||||
doReturn(mActivity).when(mFragment).getActivity();
|
||||
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
|
||||
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewCreated_verifyAction() {
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
|
||||
verify(mGlifLayoutView).setHeaderText(
|
||||
mContext.getString(R.string.accessibility_screen_magnification_title));
|
||||
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();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getMetricsCategory_returnsCorrectCategory() {
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(
|
||||
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHelpResource_shouldNotHaveHelpResource() {
|
||||
assertThat(mFragment.getHelpResource()).isEqualTo(0);
|
||||
}
|
||||
|
||||
private static class TestToggleScreenMagnificationPreferenceFragmentForSetupWizard
|
||||
extends ToggleScreenMagnificationPreferenceFragmentForSetupWizard {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceManager mPreferenceManager;
|
||||
|
||||
TestToggleScreenMagnificationPreferenceFragmentForSetupWizard(Context context) {
|
||||
super();
|
||||
mContext = context;
|
||||
mPreferenceManager = new PreferenceManager(context);
|
||||
mPreferenceManager.setPreferences(mPreferenceManager.createPreferenceScreen(context));
|
||||
mTopIntroPreference = new TopIntroPreference(context);
|
||||
mSettingsPreference = new Preference(context);
|
||||
mFollowingTypingSwitchPreference = new SwitchPreference(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPreferenceScreenResId() {
|
||||
return R.xml.placeholder_prefs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceManager.getPreferenceScreen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPreferenceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,133 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
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;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
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;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link ToggleScreenReaderPreferenceFragmentForSetupWizard}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ToggleScreenReaderPreferenceFragmentForSetupWizardTest {
|
||||
|
||||
private static final String TEST_TITLE = "test_title";
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private SettingsActivity mActivity;
|
||||
@Mock
|
||||
private GlifPreferenceLayout mGlifLayoutView;
|
||||
@Mock
|
||||
private SettingsMainSwitchBar mSwitchBar;
|
||||
@Mock
|
||||
private FooterBarMixin mFooterBarMixin;
|
||||
private ToggleScreenReaderPreferenceFragmentForSetupWizard mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mFragment = spy(new TestToggleScreenReaderPreferenceFragmentForSetupWizard(mContext));
|
||||
doReturn(mActivity).when(mFragment).getActivity();
|
||||
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
|
||||
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewCreated_verifyAction() {
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
verify(mGlifLayoutView).setHeaderText(TEST_TITLE);
|
||||
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();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getMetricsCategory_returnsCorrectCategory() {
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(
|
||||
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER);
|
||||
}
|
||||
|
||||
private static class TestToggleScreenReaderPreferenceFragmentForSetupWizard
|
||||
extends ToggleScreenReaderPreferenceFragmentForSetupWizard {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceManager mPreferenceManager;
|
||||
|
||||
TestToggleScreenReaderPreferenceFragmentForSetupWizard(Context context) {
|
||||
super();
|
||||
mContext = context;
|
||||
mPreferenceManager = new PreferenceManager(context);
|
||||
mPreferenceManager.setPreferences(mPreferenceManager.createPreferenceScreen(context));
|
||||
mTopIntroPreference = new TopIntroPreference(context);
|
||||
mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(context);
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString(AccessibilitySettings.EXTRA_TITLE, TEST_TITLE);
|
||||
setArguments(bundle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPreferenceScreenResId() {
|
||||
return R.xml.placeholder_prefs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceManager.getPreferenceScreen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPreferenceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,133 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
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;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
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;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link ToggleSelectToSpeakPreferenceFragmentForSetupWizard}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest {
|
||||
|
||||
private static final String TEST_TITLE = "test_title";
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private SettingsActivity mActivity;
|
||||
@Mock
|
||||
private GlifPreferenceLayout mGlifLayoutView;
|
||||
@Mock
|
||||
private SettingsMainSwitchBar mSwitchBar;
|
||||
@Mock
|
||||
private FooterBarMixin mFooterBarMixin;
|
||||
private ToggleSelectToSpeakPreferenceFragmentForSetupWizard mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mFragment = spy(new TestToggleSelectToSpeakPreferenceFragmentForSetupWizard(mContext));
|
||||
doReturn(mActivity).when(mFragment).getActivity();
|
||||
when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
|
||||
doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewCreated_verifyAction() {
|
||||
mFragment.onViewCreated(mGlifLayoutView, null);
|
||||
verify(mGlifLayoutView).setHeaderText(TEST_TITLE);
|
||||
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();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getMetricsCategory_returnsCorrectCategory() {
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(
|
||||
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK);
|
||||
}
|
||||
|
||||
private static class TestToggleSelectToSpeakPreferenceFragmentForSetupWizard
|
||||
extends ToggleSelectToSpeakPreferenceFragmentForSetupWizard {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceManager mPreferenceManager;
|
||||
|
||||
TestToggleSelectToSpeakPreferenceFragmentForSetupWizard(Context context) {
|
||||
super();
|
||||
mContext = context;
|
||||
mPreferenceManager = new PreferenceManager(context);
|
||||
mPreferenceManager.setPreferences(mPreferenceManager.createPreferenceScreen(context));
|
||||
mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(context);
|
||||
mTopIntroPreference = new TopIntroPreference(context);
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString(AccessibilitySettings.EXTRA_TITLE, TEST_TITLE);
|
||||
setArguments(bundle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPreferenceScreenResId() {
|
||||
return R.xml.placeholder_prefs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceManager.getPreferenceScreen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPreferenceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user