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

Replace placeholder ROLE_ASSISTANT with ROLE_NOTES.

Browse Source 
Bug: 254834764
Test: StylusDevicesController
Change-Id: I2303034180f9609db8f1a6d663c389a55dd04600
This commit is contained in:
Vania Januar
2023-01-04 16:22:38 +00:00
parent 47f6d387e7
commit e5651cd86e
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
View File

@@ -91,8 +91,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
return null; return null;
} }
// TODO(b/254834764): replace with notes role once merged List<String> roleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_NOTES,
List<String> roleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_ASSISTANT,
mContext.getUser()); mContext.getUser());
if (roleHolders.isEmpty()) { if (roleHolders.isEmpty()) {
return null; return null;
@@ -113,6 +112,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
pref.setKey(KEY_DEFAULT_NOTES); pref.setKey(KEY_DEFAULT_NOTES);
pref.setTitle(mContext.getString(R.string.stylus_default_notes_app)); pref.setTitle(mContext.getString(R.string.stylus_default_notes_app));
pref.setIcon(R.drawable.ic_article); pref.setIcon(R.drawable.ic_article);
pref.setOnPreferenceClickListener(this);
pref.setEnabled(true); pref.setEnabled(true);
pref.setSummary(appName); pref.setSummary(appName);
return pref; return pref;
@@ -148,9 +148,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
case KEY_DEFAULT_NOTES: case KEY_DEFAULT_NOTES:
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
String packageName = pm.getPermissionControllerPackageName(); String packageName = pm.getPermissionControllerPackageName();
// TODO(b/254834764): replace with notes role once merged
Intent intent = new Intent(Intent.ACTION_MANAGE_DEFAULT_APP).setPackage( Intent intent = new Intent(Intent.ACTION_MANAGE_DEFAULT_APP).setPackage(
packageName).putExtra(Intent.EXTRA_ROLE_NAME, RoleManager.ROLE_ASSISTANT); packageName).putExtra(Intent.EXTRA_ROLE_NAME, RoleManager.ROLE_NOTES);
mContext.startActivity(intent); mContext.startActivity(intent);
break; break;
case KEY_HANDWRITING: case KEY_HANDWRITING:

11
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
View File

@@ -99,8 +99,7 @@ public class StylusDevicesControllerTest {
when(mContext.getSystemService(RoleManager.class)).thenReturn(mRm); when(mContext.getSystemService(RoleManager.class)).thenReturn(mRm);
doNothing().when(mContext).startActivity(any()); doNothing().when(mContext).startActivity(any());
// TODO(b/254834764): notes role placeholder when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_NOTES), any(UserHandle.class)))
when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_ASSISTANT), any(UserHandle.class)))
.thenReturn(Collections.singletonList(NOTES_PACKAGE_NAME)); .thenReturn(Collections.singletonList(NOTES_PACKAGE_NAME));
when(mContext.getPackageManager()).thenReturn(mPm); when(mContext.getPackageManager()).thenReturn(mPm);
when(mPm.getApplicationInfo(eq(NOTES_PACKAGE_NAME), when(mPm.getApplicationInfo(eq(NOTES_PACKAGE_NAME),
@@ -237,8 +236,7 @@ public class StylusDevicesControllerTest {
@Test @Test
public void defaultNotesPreference_noRoleHolder_hidesNotesRoleApp() { public void defaultNotesPreference_noRoleHolder_hidesNotesRoleApp() {
// TODO(b/254834764): replace with notes role once merged when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_NOTES), any(UserHandle.class)))
when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_ASSISTANT), any(UserHandle.class)))
.thenReturn(Collections.emptyList()); .thenReturn(Collections.emptyList());
showScreen(mController); showScreen(mController);
@@ -258,14 +256,13 @@ public class StylusDevicesControllerTest {
showScreen(mController); showScreen(mController);
Preference defaultNotesPref = mPreferenceContainer.getPreference(0); Preference defaultNotesPref = mPreferenceContainer.getPreference(0);
mController.onPreferenceClick(defaultNotesPref); mController.onPreferenceClick(defaultNotesPref);
verify(mContext).startActivity(captor.capture());
verify(mContext).startActivity(captor.capture());
Intent intent = captor.getValue(); Intent intent = captor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MANAGE_DEFAULT_APP); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MANAGE_DEFAULT_APP);
assertThat(intent.getPackage()).isEqualTo(permissionPackageName); assertThat(intent.getPackage()).isEqualTo(permissionPackageName);
// TODO(b/254834764): when notes role is merged
assertThat(intent.getStringExtra(Intent.EXTRA_ROLE_NAME)).isEqualTo( assertThat(intent.getStringExtra(Intent.EXTRA_ROLE_NAME)).isEqualTo(
RoleManager.ROLE_ASSISTANT); RoleManager.ROLE_NOTES);
} }
@Test @Test