Merge "Update password & account settings icon size" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-05-03 06:52:54 +00:00
committed by Android (Google) Code Review

View File

@@ -44,7 +44,6 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -53,6 +52,7 @@ import com.android.internal.os.IResultReceiver;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.AppPreference;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.List; import java.util.List;
@@ -116,7 +116,7 @@ public class PasswordsPreferenceController extends BasePreferenceController
Context prefContext, @UserIdInt int user, PreferenceGroup group) { Context prefContext, @UserIdInt int user, PreferenceGroup group) {
for (int i = 0; i < mServices.size(); i++) { for (int i = 0; i < mServices.size(); i++) {
final AutofillServiceInfo service = mServices.get(i); final AutofillServiceInfo service = mServices.get(i);
final Preference pref = new Preference(prefContext); final AppPreference pref = new AppPreference(prefContext);
final ServiceInfo serviceInfo = service.getServiceInfo(); final ServiceInfo serviceInfo = service.getServiceInfo();
pref.setTitle(serviceInfo.loadLabel(mPm)); pref.setTitle(serviceInfo.loadLabel(mPm));
final Drawable icon = final Drawable icon =