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

Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0

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

Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-10-04 13:32:33 +00:00
committed by Automerger Merge Worker
parent a05cf53404 b5b8bd54a0
commit 112b5765e0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/user_aspect_ratio_details.xml
View File

@@ -21,6 +21,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/aspect_ratio_experimental_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="app_aspect_ratio_summary"
android:order="-1001"
android:title="@string/summary_placeholder"
settings:searchable="false"/>
<com.android.settingslib.widget.ActionButtonsPreference
android:key="header_view" />

6
src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
View File

@@ -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)