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

Commit 8a7228ac authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Add user aspect ratio detail destination to settings" into udc-qpr-dev

parents a72b00a9 1dc17512

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"

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 = {