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

Commit 13ca8050 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS setting"

parents f9b7201a 9669e90c

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11309,6 +11309,13 @@ public final class Settings { 
         */

        public static final String ZRAM_ENABLED =

                "zram_enabled";



        /**

         * Whether smart replies in notifications are enabled.

         * @hide

         */

        public static final String ENABLE_SMART_REPLIES_IN_NOTIFICATIONS =

                "enable_smart_replies_in_notifications";

    }



    /**

core/proto/android/providers/settings.proto

+2 −1
Original line number Diff line number Diff line
@@ -389,8 +389,9 @@ message GlobalSettingsProto { 
    optional SettingProto notification_snooze_options = 341;

    optional SettingProto enable_gnss_raw_meas_full_tracking = 346;

    optional SettingProto zram_enabled = 347;

    optional SettingProto enable_smart_replies_in_notifications = 348;



    // Next tag = 348;

    // Next tag = 349;

}



message SecureSettingsProto {

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ public class SettingsBackupTest { 
                    Settings.Global.ENABLE_DELETION_HELPER_NO_THRESHOLD_TOGGLE,

                    Settings.Global.ENABLE_DISKSTATS_LOGGING,

                    Settings.Global.ENABLE_EPHEMERAL_FEATURE,

                    Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS,

                    Settings.Global.ENHANCED_4G_MODE_ENABLED,

                    Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,

                    Settings.Global.ERROR_LOGCAT_PREFIX,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,9 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                    Settings.Global.ZRAM_ENABLED,

                    GlobalSettingsProto.ZRAM_ENABLED);

        dumpSetting(s, p,

                Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS,

                GlobalSettingsProto.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS);

    }



    /** Dump a single {@link SettingsState.Setting} to a proto buf */