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

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

Browse Source 
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>
This commit is contained in:
Jason Chiu
2022-11-08 05:02:35 +00:00
committed by Automerger Merge Worker
parent 6d16483eee b9b1225ac3
commit 2cbced55a4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/homepage_preference.xml
View File

@@ -39,8 +39,8 @@
<androidx.preference.internal.PreferenceImageView <androidx.preference.internal.PreferenceImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="wrap_content" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
app:maxWidth="48dp" app:maxWidth="48dp"
app:maxHeight="48dp"/> app:maxHeight="48dp"/>

6
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -382,10 +382,8 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
// Icon provided by the content provider overrides any static icon. // Icon provided by the content provider overrides any static icon.
if (tile.getMetaData() != null if (tile.getMetaData() != null
&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) { && tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {
// Set a transparent color before starting to fetch the real icon, this is necessary // Reserve the icon space to avoid preference padding change.
// to avoid preference padding change. preference.setIconSpaceReserved(true);
setPreferenceIcon(preference, tile, forceRoundedIcon, mContext.getPackageName(),
Icon.createWithResource(mContext, android.R.color.transparent));
ThreadUtils.postOnBackgroundThread(() -> { ThreadUtils.postOnBackgroundThread(() -> {
final Intent intent = tile.getIntent(); final Intent intent = tile.getIntent();