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

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

Merge "Update ringer setting API visibility per council feeedback"

parents 7c8b1541 8359ede7

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -6128,7 +6128,6 @@ package android.provider { 
    field public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";

    field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";

    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

    field public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";

    field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa
@@ -6137,6 +6136,9 @@ package android.provider { 
    field public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; // 0x1

    field public static final String USER_SETUP_PERSONALIZATION_STATE = "user_setup_personalization_state";

    field public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture";

    field public static final int VOLUME_HUSH_MUTE = 2; // 0x2

    field public static final int VOLUME_HUSH_OFF = 0; // 0x0

    field public static final int VOLUME_HUSH_VIBRATE = 1; // 0x1

  }















  public static final class Telephony.Carriers implements android.provider.BaseColumns {

































core/java/android/provider/Settings.java



+9
−4




























Original line number
Diff line number
Diff line








@@ -6344,7 +6344,6 @@ public final class Settings {













         * Number of times the user has manually clicked the ringer toggle















         * @hide















         */













        @SystemApi















        public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";





























        private static final Validator MANUAL_RINGER_TOGGLE_COUNT_VALIDATOR =










@@ -8517,9 +8516,15 @@ public final class Settings {













        @SystemApi















        public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture";



























        /** @hide */ public static final int VOLUME_HUSH_OFF = 0;













        /** @hide */ public static final int VOLUME_HUSH_VIBRATE = 1;













        /** @hide */ public static final int VOLUME_HUSH_MUTE = 2;













        /** @hide */













        @SystemApi













        public static final int VOLUME_HUSH_OFF = 0;













        /** @hide */













        @SystemApi













        public static final int VOLUME_HUSH_VIBRATE = 1;













        /** @hide */













        @SystemApi













        public static final int VOLUME_HUSH_MUTE = 2;





























        private static final Validator VOLUME_HUSH_GESTURE_VALIDATOR =















                NON_NEGATIVE_INTEGER_VALIDATOR;