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

Commit 7fd36218 authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Reserve the icon space to avoid preference padding change" into... 

Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225a am: 2cbced55

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450



Change-Id: Ib44c08584f56e992d2caa26ee8018f6724993390
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 292593f5 2cbced55

res/layout/homepage_preference.xml

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

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+2 −4
Original line number Diff line number Diff line
@@ -382,10 +382,8 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
        // 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();