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

Merge changes Ie8bb0705,I6b00707d into main

Browse Source 
* changes:
  Add missing description to work profile tab
  Disable primary provider clickable state
This commit is contained in:
Becca Hughes
2024-04-08 21:28:04 +00:00
committed by Android (Google) Code Review
parent 22b3304bf8 75b679d96d
commit 9cc97b3287
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/accounts_work_dashboard_settings_credman.xml
View File

@@ -22,6 +22,9 @@
android:title="@string/account_dashboard_title_with_passkeys" android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts"> settings:keywords="@string/keywords_accounts">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/credman_main_settings_intro_text" />
<PreferenceCategory <PreferenceCategory
android:key="default_service_category" android:key="default_service_category"
android:order="10" android:order="10"

1
src/com/android/settings/applications/credentials/PrimaryProviderPreference.java
View File

@@ -129,6 +129,7 @@ public class PrimaryProviderPreference extends GearPreference {
} }
}); });
setVisibility(mOpenButton, mOpenButtonVisible); setVisibility(mOpenButton, mOpenButtonVisible);
holder.itemView.setClickable(false);
mChangeButton = (Button) holder.findViewById(R.id.change_button); mChangeButton = (Button) holder.findViewById(R.id.change_button);
mChangeButton.setOnClickListener( mChangeButton.setOnClickListener(