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

Merge "Fix icon UX bug" into main

Browse Source
This commit is contained in:
Becca Hughes
2023-10-11 23:50:29 +00:00
committed by Android (Google) Code Review
parent 6199490cd3 6a57e6d28b
commit 4951641ddb
2 changed files with 101 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -45,7 +45,6 @@ import android.os.UserManager;
import android.provider.Settings;
import android.service.autofill.AutofillServiceInfo;
import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.View;
import android.widget.Switch;
@@ -98,7 +97,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
private static final int MAX_SELECTABLE_PROVIDERS = 5;
private final PackageManager mPm;
private final IconDrawableFactory mIconFactory;
private final List<CredentialProviderInfo> mServices;
private final Set<String> mEnabledPackageNames;
private final @Nullable CredentialManager mCredentialManager;
@@ -119,7 +117,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
public CredentialManagerPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mPm = context.getPackageManager();
mIconFactory = IconDrawableFactory.newInstance(mContext);
mServices = new ArrayList<>();
mEnabledPackageNames = new HashSet<>();
mExecutor = ContextCompat.getMainExecutor(mContext);
@@ -575,9 +572,11 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
pref.setTitle(title);
if (icon != null) {
pref.setIcon(Utils.getSafeIcon(icon));
pref.setIcon(icon);
}
pref.setLayoutResource(R.layout.preference_icon_credman);
if (subtitle != null) {
pref.setSummary(subtitle);
}