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

Commit 7c40c31f authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

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

Merge "Add user aspect ratio detail destination to settings" into udc-qpr-dev am: 8a7228ac am: ed59726c

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



Change-Id: I9467e2f5ece71bc901cc51bebf29c10e3a76698d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8d74b29 ed59726c

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -1579,6 +1579,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
@@ -362,6 +362,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;
@@ -371,7 +372,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 = {