From 0c14078504a56123d21c5b19d4e02622cdf827d9 Mon Sep 17 00:00:00 2001
From: Becca Hughes <beccahughes@google.com>
Date: Mon, 8 Apr 2024 10:05:06 -0700
Subject: [PATCH 1/2] Disable primary provider clickable state

Since this view isn't clickable this was
resulting in incorrect talkback
descriptions.

Bug: 322252309
Test: on device manual
Change-Id: I6b00707dbab9081a5ed09cc2383d06baf0397600
---
 .../applications/credentials/PrimaryProviderPreference.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java b/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
index 84459e057ab..4a45ea4ed06 100644
--- a/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
+++ b/src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
@@ -129,6 +129,7 @@ public class PrimaryProviderPreference extends GearPreference {
                     }
                 });
         setVisibility(mOpenButton, mOpenButtonVisible);
+        holder.itemView.setClickable(false);
 
         mChangeButton = (Button) holder.findViewById(R.id.change_button);
         mChangeButton.setOnClickListener(

From 75b679d96d5a7aa9fc6ce77897a6c9486323f052 Mon Sep 17 00:00:00 2001
From: Becca Hughes <beccahughes@google.com>
Date: Mon, 8 Apr 2024 12:12:20 -0700
Subject: [PATCH 2/2] Add missing description to work profile tab

Impl:
https: //hsv.googleplex.com/6193893270880256
Bug: 333082300
Test: manual on device
Change-Id: Ie8bb07050d2d215821b2a4df08c6739aedbf904c
---
 res/xml/accounts_work_dashboard_settings_credman.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/xml/accounts_work_dashboard_settings_credman.xml b/res/xml/accounts_work_dashboard_settings_credman.xml
index 44bdb52a915..c275b82140b 100644
--- a/res/xml/accounts_work_dashboard_settings_credman.xml
+++ b/res/xml/accounts_work_dashboard_settings_credman.xml
@@ -22,6 +22,9 @@
     android:title="@string/account_dashboard_title_with_passkeys"
     settings:keywords="@string/keywords_accounts">
 
+    <com.android.settingslib.widget.TopIntroPreference
+      android:title="@string/credman_main_settings_intro_text" />
+
     <PreferenceCategory
         android:key="default_service_category"
         android:order="10"