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

Commit 92024e1a authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Migrate Settings intents" into main

parents 84c49b9f dea5102c

Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ android_library { 
        "telephony-common",

        "ims-common",

    ],

    flags_packages: [

        "android.app.flags-aconfig",

    ],

}



platform_compat_config {
@@ -155,6 +158,9 @@ android_app { 
    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    flags_packages: [

        "android.app.flags-aconfig",

    ],

}



android_library_import {

AndroidManifest.xml

+64 −5
Original line number Diff line number Diff line
@@ -1286,21 +1286,64 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="Settings$ModesSettingsActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_homepage_notification"

            android:exported="true">

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

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

            </intent-filter>

            <intent-filter android:priority="41"

                           android:featureFlag="android.app.modes_ui">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="10"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="10"

                           android:featureFlag="android.app.modes_ui">

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.notification.modes.ZenModesListFragment"/>

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

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

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

                       android:value="true" />

        </activity>



        <activity

            android:name="Settings$ZenModeSettingsActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_homepage_notification"

            android:exported="true">

            <intent-filter android:priority="1">

            <intent-filter android:priority="1"

                           android:featureFlag="!android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="1">

            <intent-filter android:priority="1"

                           android:featureFlag="!android.app.modes_ui">

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

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

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

            </intent-filter>

            <intent-filter android:priority="41">

            <intent-filter android:priority="41"

                           android:featureFlag="!android.app.modes_ui">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>
@@ -1312,6 +1355,20 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$ModeSettingsActivity"

            android:exported="true">

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.notification.modes.ZenModeFragment"/>

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

                       android:value="true" />

        </activity>



        <activity

            android:name=".notification.zen.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"
@@ -1351,11 +1408,13 @@ 
            android:label="@string/zen_mode_automation_settings_title"

            android:icon="@drawable/ic_notifications"

            android:exported="true">

            <intent-filter android:priority="1">

            <intent-filter android:priority="10"

                           android:featureFlag="!android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="1">

            <intent-filter android:priority="10"

                           android:featureFlag="!android.app.modes_ui">

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

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

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

src/com/android/settings/Settings.java

+6 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings; 


import static android.provider.Settings.ACTION_PRIVACY_SETTINGS;



import android.annotation.FlaggedApi;

import android.app.Flags;

import android.content.ActivityNotFoundException;

import android.content.Intent;

import android.os.Bundle;
@@ -317,11 +319,13 @@ public class Settings extends SettingsActivity { 
    public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

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

    @FlaggedApi(Flags.FLAG_MODES_UI)

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

    @FlaggedApi(Flags.FLAG_MODES_UI)

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

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

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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ import com.android.settings.notification.app.AppNotificationSettings; 
import com.android.settings.notification.app.ChannelNotificationSettings;

import com.android.settings.notification.app.ConversationListSettings;

import com.android.settings.notification.history.NotificationStation;

import com.android.settings.notification.modes.ZenModeFragment;

import com.android.settings.notification.modes.ZenModesListFragment;

import com.android.settings.notification.zen.ZenAccessSettings;

import com.android.settings.notification.zen.ZenModeAutomationSettings;

import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
@@ -396,6 +398,8 @@ public class SettingsGateway { 
            CellularSecuritySettingsFragment.class.getName(),

            AccessibilityHearingAidsFragment.class.getName(),

            HearingDevicePairingFragment.class.getName(),

            ZenModesListFragment.class.getName(),

            ZenModeFragment.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {

src/com/android/settings/notification/modes/ZenModeActionsPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.notification.modes;



import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;

import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;



import android.content.Context;

import android.os.Bundle;
@@ -50,7 +50,7 @@ class ZenModeActionsPreferenceController extends AbstractZenModePreferenceContro 
        buttonsPreference.setButton2Enabled(zenMode.canEditIcon());

        buttonsPreference.setButton2OnClickListener(v -> {

            Bundle bundle = new Bundle();

            bundle.putString(MODE_ID, zenMode.getId());

            bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());

            new SubSettingLauncher(mContext)

                    .setDestination(ZenModeIconPickerFragment.class.getName())

                    // TODO: b/332937635 - Update metrics category