From e08d0f88d33a94a4910553555ef9150b51faf8e7 Mon Sep 17 00:00:00 2001 From: Graciela Wissen Putri Date: Tue, 3 Oct 2023 13:34:03 +0000 Subject: [PATCH] Add warning text to Aspect ratio app info header Settings > Apps > App info > Aspect ratio Fix: 301440671 Test: Manual Change-Id: I1d24a38c37cfb95e5711308c96f1fc8da91d5e53 --- res/xml/user_aspect_ratio_details.xml | 6 ++++++ .../applications/appcompat/UserAspectRatioDetails.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/res/xml/user_aspect_ratio_details.xml b/res/xml/user_aspect_ratio_details.xml index f95b678957c..44a7589fe76 100644 --- a/res/xml/user_aspect_ratio_details.xml +++ b/res/xml/user_aspect_ratio_details.xml @@ -21,6 +21,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:title="@string/aspect_ratio_experimental_title"> + + diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java index 81741b740b1..dfb583ce2fc 100644 --- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java +++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java @@ -30,6 +30,7 @@ import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Intent; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; @@ -57,6 +58,7 @@ public class UserAspectRatioDetails extends AppInfoBase implements RadioWithImagePreference.OnClickListener { private static final String TAG = UserAspectRatioDetails.class.getSimpleName(); + private static final String KEY_HEADER_SUMMARY = "app_aspect_ratio_summary"; private static final String KEY_HEADER_BUTTONS = "header_view"; private static final String KEY_PREF_FULLSCREEN = "fullscreen_pref"; private static final String KEY_PREF_HALF_SCREEN = "half_screen_pref"; @@ -203,6 +205,10 @@ public class UserAspectRatioDetails extends AppInfoBase implements private void initPreferences() { addPreferencesFromResource(R.xml.user_aspect_ratio_details); + final String summary = getContext().getResources().getString( + R.string.aspect_ratio_main_summary, Build.MODEL); + findPreference(KEY_HEADER_SUMMARY).setTitle(summary); + ((ActionButtonsPreference) findPreference(KEY_HEADER_BUTTONS)) .setButton1Text(R.string.launch_instant_app) .setButton1Icon(R.drawable.ic_settings_open)