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

Commit cf3728a3 authored by Yiwen Chen's avatar Yiwen Chen Committed by Android (Google) Code Review
Browse files

Merge "Create a new setting in System Settings.Secure class to control whether... 

Merge "Create a new setting in System Settings.Secure class to control whether ramping ringer is used."
parents a7babbbf 36e40ff2

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -8881,6 +8881,14 @@ public final class Settings { 
         */

        public static final String ADD_USERS_WHEN_LOCKED = "add_users_when_locked";













        /**













         * Whether applying ramping ringer on incoming phone call ringtone.













         * <p>1 = apply ramping ringer













         * <p>0 = do not apply ramping ringer













         * @hide













         */













        public static final String APPLY_RAMPING_RINGER = "apply_ramping_ringer";



























        /**















         * Setting whether the global gesture for enabling accessibility is enabled.















         * If this gesture is enabled the user will be able to perfrom it to enable

































core/proto/android/providers/settings/global.proto



+3
−1




























Original line number
Diff line number
Diff line








@@ -558,6 +558,8 @@ message GlobalSettingsProto {













    // ringer mode.















    optional SettingProto mode_ringer = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    optional SettingProto apply_ramping_ringer = 147 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    message MultiSim {















        option (android.msg_privacy).dest = DEST_EXPLICIT;


























@@ -1017,5 +1019,5 @@ message GlobalSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 147;













    // Next tag = 148;















}
























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -114,6 +114,7 @@ public class SettingsBackupTest {













                    Settings.Global.ANOMALY_CONFIG_VERSION,















                    Settings.Global.APN_DB_UPDATE_CONTENT_URL,















                    Settings.Global.APN_DB_UPDATE_METADATA_URL,













                    Settings.Global.APPLY_RAMPING_RINGER,















                    Settings.Global.APP_BINDING_CONSTANTS,















                    Settings.Global.APP_IDLE_CONSTANTS,















                    Settings.Global.APP_OPS_CONSTANTS,