Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450
Change-Id: I848120e8276098a0df41c2c1d8cea68682c21e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml
index ed1a2f1..18ecdcf 100644
--- a/res/layout/homepage_preference.xml
+++ b/res/layout/homepage_preference.xml
@@ -39,8 +39,8 @@
<androidx.preference.internal.PreferenceImageView
android:id="@android:id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
app:maxWidth="48dp"
app:maxHeight="48dp"/>
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 80c9ec6..f6dd0b7 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -382,10 +382,8 @@
// Icon provided by the content provider overrides any static icon.
if (tile.getMetaData() != null
&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {
- // Set a transparent color before starting to fetch the real icon, this is necessary
- // to avoid preference padding change.
- setPreferenceIcon(preference, tile, forceRoundedIcon, mContext.getPackageName(),
- Icon.createWithResource(mContext, android.R.color.transparent));
+ // Reserve the icon space to avoid preference padding change.
+ preference.setIconSpaceReserved(true);
ThreadUtils.postOnBackgroundThread(() -> {
final Intent intent = tile.getIntent();