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

Merge "Provide a way to Accessibility button settings via intent." into sc-dev

Browse Source
This commit is contained in:
PETER LIANG
2021-05-12 02:59:10 +00:00
committed by Android (Google) Code Review
parent 16e8c767f1 869c614ab2
commit f2d70ab320
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_BUTTON_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityServiceInfo;
@@ -101,6 +102,12 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
arguments, getContext()); arguments, getContext());
return new LaunchFragmentArguments(destination, arguments); return new LaunchFragmentArguments(destination, arguments);
} }
if (ACCESSIBILITY_BUTTON_COMPONENT_NAME.equals(componentName)) {
final String destination = AccessibilityButtonFragment.class.getName();
return new LaunchFragmentArguments(destination, /* arguments= */ null);
}
return null; return null;
} }

40
tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_BUTTON_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -85,7 +86,18 @@ public class AccessibilityDetailsSettingsFragmentTest {
} }
@Test @Test
public void onCreate_hasValidExtraComponentName_launchExpectedFragmentAndFinish() { public void onCreate_afterSuccessfullyLaunch_shouldBeFinished() {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY);
verify(mActivity).finish();
}
@Test
public void onCreate_hasValidExtraComponentName_launchExpectedFragment() {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME); intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent(); doReturn(intent).when(mActivity).getIntent();
@@ -94,11 +106,10 @@ public class AccessibilityDetailsSettingsFragmentTest {
assertStartActivityWithExpectedFragment(mActivity, assertStartActivityWithExpectedFragment(mActivity,
ToggleAccessibilityServicePreferenceFragment.class.getName()); ToggleAccessibilityServicePreferenceFragment.class.getName());
verify(mActivity).finish();
} }
@Test @Test
public void onCreate_hasInvalidExtraComponentName_launchAccessibilitySettingsAndFinish() { public void onCreate_hasInvalidExtraComponentName_launchAccessibilitySettings() {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, PACKAGE_NAME + "/.service"); intent.putExtra(Intent.EXTRA_COMPONENT_NAME, PACKAGE_NAME + "/.service");
doReturn(intent).when(mActivity).getIntent(); doReturn(intent).when(mActivity).getIntent();
@@ -106,22 +117,20 @@ public class AccessibilityDetailsSettingsFragmentTest {
mFragment.onCreate(Bundle.EMPTY); mFragment.onCreate(Bundle.EMPTY);
assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName()); assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
verify(mActivity).finish();
} }
@Test @Test
public void onCreate_hasNoExtraComponentName_launchAccessibilitySettingsAndFinish() { public void onCreate_hasNoExtraComponentName_launchAccessibilitySettings() {
final Intent intent = new Intent(); final Intent intent = new Intent();
doReturn(intent).when(mActivity).getIntent(); doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY); mFragment.onCreate(Bundle.EMPTY);
assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName()); assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
verify(mActivity).finish();
} }
@Test @Test
public void onCreate_extraComponentNameIsDisallowed_launchAccessibilitySettingsAndFinish() { public void onCreate_extraComponentNameIsDisallowed_launchAccessibilitySettings() {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME); intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent(); doReturn(intent).when(mActivity).getIntent();
@@ -130,11 +139,10 @@ public class AccessibilityDetailsSettingsFragmentTest {
mFragment.onCreate(Bundle.EMPTY); mFragment.onCreate(Bundle.EMPTY);
assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName()); assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
verify(mActivity).finish();
} }
@Test @Test
public void onCreate_magnificationComponentName_launchMagnificationFragmentAndFinish() { public void onCreate_magnificationComponentName_launchMagnificationFragment() {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, intent.putExtra(Intent.EXTRA_COMPONENT_NAME,
MAGNIFICATION_COMPONENT_NAME.flattenToString()); MAGNIFICATION_COMPONENT_NAME.flattenToString());
@@ -145,7 +153,19 @@ public class AccessibilityDetailsSettingsFragmentTest {
assertStartActivityWithExpectedFragment(mActivity, assertStartActivityWithExpectedFragment(mActivity,
ToggleScreenMagnificationPreferenceFragment.class.getName()); ToggleScreenMagnificationPreferenceFragment.class.getName());
verify(mActivity).finish(); }
@Test
public void onCreate_accessibilityButton_launchAccessibilityButtonFragment() {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME,
ACCESSIBILITY_BUTTON_COMPONENT_NAME.flattenToString());
doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY);
assertStartActivityWithExpectedFragment(mActivity,
AccessibilityButtonFragment.class.getName());
} }
private AccessibilityServiceInfo getMockAccessibilityServiceInfo() { private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {