From e5651cd86ed2e43c62741b7c9fd6f6d52fe334ba Mon Sep 17 00:00:00 2001
From: Vania Januar <vanjan@google.com>
Date: Wed, 4 Jan 2023 16:22:38 +0000
Subject: [PATCH] Replace placeholder ROLE_ASSISTANT with ROLE_NOTES.

Bug: 254834764
Test: StylusDevicesController
Change-Id: I2303034180f9609db8f1a6d663c389a55dd04600
---
 .../stylus/StylusDevicesController.java               |  7 +++----
 .../stylus/StylusDevicesControllerTest.java           | 11 ++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java b/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
index 024d6f569c3..7ed02491ca3 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
@@ -91,8 +91,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
             return null;
         }
 
-        // TODO(b/254834764): replace with notes role once merged
-        List<String> roleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_ASSISTANT,
+        List<String> roleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_NOTES,
                 mContext.getUser());
         if (roleHolders.isEmpty()) {
             return null;
@@ -113,6 +112,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
         pref.setKey(KEY_DEFAULT_NOTES);
         pref.setTitle(mContext.getString(R.string.stylus_default_notes_app));
         pref.setIcon(R.drawable.ic_article);
+        pref.setOnPreferenceClickListener(this);
         pref.setEnabled(true);
         pref.setSummary(appName);
         return pref;
@@ -148,9 +148,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
             case KEY_DEFAULT_NOTES:
                 PackageManager pm = mContext.getPackageManager();
                 String packageName = pm.getPermissionControllerPackageName();
-                // TODO(b/254834764): replace with notes role once merged
                 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);
                 break;
             case KEY_HANDWRITING:
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
index e93b4727e1d..be41787882a 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
@@ -99,8 +99,7 @@ public class StylusDevicesControllerTest {
         when(mContext.getSystemService(RoleManager.class)).thenReturn(mRm);
         doNothing().when(mContext).startActivity(any());
 
-        // TODO(b/254834764): notes role placeholder
-        when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_ASSISTANT), any(UserHandle.class)))
+        when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_NOTES), any(UserHandle.class)))
                 .thenReturn(Collections.singletonList(NOTES_PACKAGE_NAME));
         when(mContext.getPackageManager()).thenReturn(mPm);
         when(mPm.getApplicationInfo(eq(NOTES_PACKAGE_NAME),
@@ -237,8 +236,7 @@ public class StylusDevicesControllerTest {
 
     @Test
     public void defaultNotesPreference_noRoleHolder_hidesNotesRoleApp() {
-        // TODO(b/254834764): replace with notes role once merged
-        when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_ASSISTANT), any(UserHandle.class)))
+        when(mRm.getRoleHoldersAsUser(eq(RoleManager.ROLE_NOTES), any(UserHandle.class)))
                 .thenReturn(Collections.emptyList());
         showScreen(mController);
 
@@ -258,14 +256,13 @@ public class StylusDevicesControllerTest {
         showScreen(mController);
         Preference defaultNotesPref = mPreferenceContainer.getPreference(0);
         mController.onPreferenceClick(defaultNotesPref);
-        verify(mContext).startActivity(captor.capture());
 
+        verify(mContext).startActivity(captor.capture());
         Intent intent = captor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MANAGE_DEFAULT_APP);
         assertThat(intent.getPackage()).isEqualTo(permissionPackageName);
-        // TODO(b/254834764): when notes role is merged
         assertThat(intent.getStringExtra(Intent.EXTRA_ROLE_NAME)).isEqualTo(
-                RoleManager.ROLE_ASSISTANT);
+                RoleManager.ROLE_NOTES);
     }
 
     @Test