Merge "Add restricted settings UI in Settings accessibility screeen"

This commit is contained in:
Ricky Wai
2022-01-28 11:23:17 +00:00
committed by Android (Google) Code Review
11 changed files with 315 additions and 25 deletions

View File

@@ -22,6 +22,7 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -134,7 +135,7 @@ public class AccessibilityDetailsSettingsFragmentTest {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent();
doReturn(false).when(mFragment).isServiceAllowed(any());
doReturn(false).when(mFragment).isServiceAllowed(anyInt(), any());
mFragment.onCreate(Bundle.EMPTY);

View File

@@ -368,6 +368,7 @@ public class AccessibilitySettingsTest {
private void setMockAccessibilityShortcutInfo(AccessibilityShortcutInfo mockInfo) {
final ActivityInfo activityInfo = Mockito.mock(ActivityInfo.class);
activityInfo.applicationInfo = new ApplicationInfo();
when(mockInfo.getActivityInfo()).thenReturn(activityInfo);
when(activityInfo.loadLabel(any())).thenReturn(DEFAULT_LABEL);
when(mockInfo.loadSummary(any())).thenReturn(DEFAULT_SUMMARY);