Merge changes Ie8bb0705,I6b00707d into main
* changes: Add missing description to work profile tab Disable primary provider clickable state
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user