From 41c97f8f23d8020b98d7de4f6d3268a406fa6aa4 Mon Sep 17 00:00:00 2001
From: someone5678 <someone5678@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:41:08 +0900
Subject: [PATCH] Settings: Use marketname for App Aspect Ratio summary

* If empty, use Build.MODEL

Change-Id: I27190e41bd08caac9303ae6115ad6970c9614770
---
 .../UserAspectRatioAppsPreferenceController.java   |  8 +++++++-
 .../appcompat/UserAspectRatioDetails.java          |  9 ++++++++-
 .../appcompat/UserAspectRatioAppsPageProvider.kt   | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
index 4211424351b..8ca81f4f785 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
@@ -18,6 +18,8 @@ package com.android.settings.applications.appcompat;
 
 import android.content.Context;
 import android.os.Build;
+import android.os.SystemProperties;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
@@ -43,6 +45,10 @@ public class UserAspectRatioAppsPreferenceController extends BasePreferenceContr
 
     @Override
     public CharSequence getSummary() {
-        return mContext.getResources().getString(R.string.aspect_ratio_summary_text, Build.MODEL);
+        String device = SystemProperties.get("ro.product.marketname");
+        if (TextUtils.isEmpty(device)) {
+            device = Build.MODEL;
+        }
+        return mContext.getResources().getString(R.string.aspect_ratio_summary_text, device);
     }
 }
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index cbc5a7b6100..10184bf1fa0 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -33,9 +33,11 @@ import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.os.SystemProperties;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -205,8 +207,13 @@ public class UserAspectRatioDetails extends AppInfoBase implements
     private void initPreferences() {
         addPreferencesFromResource(R.xml.user_aspect_ratio_details);
 
+        String device = SystemProperties.get("ro.product.marketname");
+        if (TextUtils.isEmpty(device)) {
+            device = Build.MODEL;
+        }
+
         final String summary = getContext().getResources().getString(
-                R.string.aspect_ratio_main_summary, Build.MODEL);
+                R.string.aspect_ratio_main_summary, device);
         findPreference(KEY_HEADER_SUMMARY).setTitle(summary);
 
         ((ActionButtonsPreference) findPreference(KEY_HEADER_BUTTONS))
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index 59026774afe..15f621aca84 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -26,7 +26,9 @@ import android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_APP_DEFAULT
 import android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_UNSET
 import android.os.Build
 import android.os.Bundle
+import android.os.SystemProperties
 import android.util.Log
+import android.text.TextUtils
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
@@ -69,6 +71,14 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
+fun getDeviceName(): String {
+    val device = SystemProperties.get("ro.product.marketname")
+    if (TextUtils.isEmpty(device)) {
+        return Build.MODEL
+    }
+    return device
+}
+
 object UserAspectRatioAppsPageProvider : SettingsPageProvider {
     override val name = "UserAspectRatioAppsPage"
     private val owner = createSettingsPage()
@@ -99,7 +109,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider {
 
     @Composable
     @VisibleForTesting
-    fun getSummary(): String = stringResource(R.string.aspect_ratio_summary_text, Build.MODEL)
+    fun getSummary(): String = stringResource(R.string.aspect_ratio_summary_text, getDeviceName())
 }
 
 @Composable
@@ -113,7 +123,7 @@ fun UserAspectRatioAppList(
         appList = appList,
         header = {
             Box(Modifier.padding(SettingsDimension.itemPadding)) {
-                SettingsBody(stringResource(R.string.aspect_ratio_main_summary_text, Build.MODEL))
+                SettingsBody(stringResource(R.string.aspect_ratio_main_summary_text, getDeviceName()))
             }
             Illustration(object : IllustrationModel {
                 override val resId = R.raw.user_aspect_ratio_education