Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc97b32 authored by Becca Hughes's avatar Becca Hughes Committed by Android (Google) Code Review
Browse files

Merge changes Ie8bb0705,I6b00707d into main 

* changes:
  Add missing description to work profile tab
  Disable primary provider clickable state
parents 22b3304b 75b679d9

res/xml/accounts_work_dashboard_settings_credman.xml

+3 −0
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/applications/credentials/PrimaryProviderPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -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(