Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5b8bd54 authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

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

parents b1c087f6 e08d0f88

res/xml/user_aspect_ratio_details.xml

+6 −0
Original line number Diff line number Diff line
@@ -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" />

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

+6 −0
Original line number Diff line number Diff line
@@ -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)