From 21f0f870f5d327a5c101a626d9d3546e8ff55516 Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Tue, 29 Aug 2023 16:05:05 +0000 Subject: [PATCH] Remove version text in user aspect ratio settings page Fix: 297153670 Test: Manual following instructions in the bug description Change-Id: Iaf757715e60ab4ff2356ee0c89bc2129948a6c08 Merged-In: Iaf757715e60ab4ff2356ee0c89bc2129948a6c08 --- .../appcompat/UserAspectRatioDetails.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java index fd831cd221b..7542f3fce40 100644 --- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java +++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java @@ -37,10 +37,14 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; -import com.android.settings.applications.AppInfoWithHeader; +import com.android.settings.Utils; +import com.android.settings.applications.AppInfoBase; +import com.android.settings.widget.EntityHeaderController; +import com.android.settingslib.applications.AppUtils; import com.android.settingslib.widget.ActionButtonsPreference; import java.util.ArrayList; @@ -49,7 +53,7 @@ import java.util.List; /** * App specific activity to show aspect ratio overrides */ -public class UserAspectRatioDetails extends AppInfoWithHeader implements +public class UserAspectRatioDetails extends AppInfoBase implements RadioWithImagePreference.OnClickListener { private static final String TAG = UserAspectRatioDetails.class.getSimpleName(); @@ -178,6 +182,24 @@ public class UserAspectRatioDetails extends AppInfoWithHeader implements } } + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + final Preference pref = EntityHeaderController + .newInstance(getActivity(), this, null /* header */) + .setIcon(Utils.getBadgedIcon(getContext(), mPackageInfo.applicationInfo)) + .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) + .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) + .setPackageName(mPackageName) + .setUid(mPackageInfo.applicationInfo.uid) + .setHasAppInfoLink(true) + .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE, + EntityHeaderController.ActionType.ACTION_NONE) + .done(getActivity(), getPrefContext()); + + getPreferenceScreen().addPreference(pref); + } + private void initPreferences() { addPreferencesFromResource(R.xml.user_aspect_ratio_details);