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

Commit 8416b224 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10844344 from 7dff7a0d to udc-qpr1-release 

Change-Id: I9f8ad13a7c2cad02b49af272ae7a3e9c88f1f032
parents ed04b978 7dff7a0d

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,20 @@ 
                android:value="@string/menu_key_apps"/>

        </activity>



        <activity android:name="Settings$UserAspectRatioAppActivity"

                  android:exported="true"

                  android:label="@string/aspect_ratio_title">

            <intent-filter>

                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.appcompat.UserAspectRatioDetails" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_apps"/>

        </activity>



        <activity

            android:name="Settings$ManageDomainUrlsActivity"

            android:exported="true"

res/xml/apps.xml

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 


    <Preference

        android:key="aspect_ratio_apps"

        android:title="@string/aspect_ratio_title"

        android:title="@string/aspect_ratio_experimental_title"

        android:summary="@string/summary_placeholder"

        android:order="22"

        settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"

res/xml/user_aspect_ratio_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:title="@string/aspect_ratio_title">

    android:title="@string/aspect_ratio_experimental_title">



    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="header_view" />

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ public class Settings extends SettingsActivity { 
    public static class ClonedAppsListActivity extends SettingsActivity { /* empty */ }

    /** Activity to manage Aspect Ratio app list page */

    public static class UserAspectRatioAppListActivity extends SettingsActivity { /* empty */ }

    /** Activity to manage Aspect Ratio app page */

    public static class UserAspectRatioAppActivity extends SettingsActivity { /* empty */ }

    public static class NotificationReviewPermissionsActivity extends SettingsActivity { /* empty */ }

    public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.settings.applications.AppDashboardFragment; 
import com.android.settings.applications.ProcessStatsSummary;

import com.android.settings.applications.ProcessStatsUi;

import com.android.settings.applications.UsageAccessDetails;

import com.android.settings.applications.appcompat.UserAspectRatioDetails;

import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;

import com.android.settings.applications.appinfo.AppInfoDashboardFragment;

import com.android.settings.applications.appinfo.AppLocaleDetails;
@@ -375,7 +376,8 @@ public class SettingsGateway { 
            ColorAndMotionFragment.class.getName(),

            LongBackgroundTasksDetails.class.getName(),

            RegionalPreferencesEntriesFragment.class.getName(),

            BatteryInfoFragment.class.getName()

            BatteryInfoFragment.class.getName(),

            UserAspectRatioDetails.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {