commit de41256dd2a3491fb281f40af91db7fc644fcbee
author Massimo Carli <mcarli@google.com> Fri Sep 08 22:53:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 08 22:53:54 2023 +0000
tree 25906211cd2446695e87de0291c7cbede2516137
parent ae0e9ab92269642c093a258269fc826ea6a32178
parent f2735decd6a73b89657d2a0b38d767b2d6d8a938

Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6

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

Change-Id: If09e05a6f965cef5432feca8b06043e45117dda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java

diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index fd831cd..7542f3f 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -37,10 +37,14 @@
 
 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 @@
 /**
  * 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 @@
         }
     }
 
+    @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);