Fine tune the icon size for some pages
Based on our Android S spec, we should make the size smaller for icons.
Test:
Notification access: https://screenshot.googleplex.com/Ah8wjmzggDQyhmP
Device admin: https://screenshot.googleplex.com/5tS64HxZz3ywPZZ
Fix: 174739497
Change-Id: Iad4a48b558084d7374fec515891d01d3e7d41108
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index e25bb1e..2126109 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -46,7 +46,7 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FilterTouchesSwitchPreference;
+import com.android.settings.widget.AppSwitchPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -168,32 +168,32 @@
if (mFooterPreference != null) {
mFooterPreference.setVisible(mAdmins.isEmpty());
}
- final Map<String, FilterTouchesSwitchPreference> preferenceCache = new ArrayMap<>();
+ final Map<String, AppSwitchPreference> preferenceCache = new ArrayMap<>();
final Context prefContext = mPreferenceGroup.getContext();
final int childrenCount = mPreferenceGroup.getPreferenceCount();
for (int i = 0; i < childrenCount; i++) {
final Preference pref = mPreferenceGroup.getPreference(i);
- if (!(pref instanceof FilterTouchesSwitchPreference)) {
+ if (!(pref instanceof AppSwitchPreference)) {
continue;
}
- final FilterTouchesSwitchPreference appSwitch = (FilterTouchesSwitchPreference) pref;
+ final AppSwitchPreference appSwitch = (AppSwitchPreference) pref;
preferenceCache.put(appSwitch.getKey(), appSwitch);
}
for (DeviceAdminListItem item : mAdmins) {
final String key = item.getKey();
- FilterTouchesSwitchPreference pref = preferenceCache.remove(key);
+ AppSwitchPreference pref = preferenceCache.remove(key);
if (pref == null) {
- pref = new FilterTouchesSwitchPreference(prefContext);
+ pref = new AppSwitchPreference(prefContext);
mPreferenceGroup.addPreference(pref);
}
bindPreference(item, pref);
}
- for (FilterTouchesSwitchPreference unusedCacheItem : preferenceCache.values()) {
+ for (AppSwitchPreference unusedCacheItem : preferenceCache.values()) {
mPreferenceGroup.removePreference(unusedCacheItem);
}
}
- private void bindPreference(DeviceAdminListItem item, FilterTouchesSwitchPreference pref) {
+ private void bindPreference(DeviceAdminListItem item, AppSwitchPreference pref) {
pref.setKey(item.getKey());
pref.setTitle(item.getName());
pref.setIcon(item.getIcon());
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 9df548c..65ad571 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -35,7 +35,6 @@
import android.view.View;
import android.widget.Toast;
-import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -48,6 +47,7 @@
import com.android.settings.widget.EmptyTextSettings;
import com.android.settingslib.applications.ServiceListing;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.List;
@@ -140,7 +140,7 @@
Log.e(TAG, "can't find package name", e);
}
- final Preference pref = new Preference(getPrefContext());
+ final AppPreference pref = new AppPreference(getPrefContext());
pref.setTitle(title);
pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
UserHandle.getUserId(service.applicationInfo.uid)));
