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

Commit 4963a111 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Modify the comment for accessibility_button_mode" into sc-v2-dev am:... 

Merge "Modify the comment for accessibility_button_mode" into sc-v2-dev am: 260d9d80 am: 43245736

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433218

Change-Id: I05c19ec794f71ad458b166b6a6945ec204014a4f
parents f35d2fbe 43245736

core/proto/android/providers/settings/secure.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ message SecureSettingsProto { 
        optional SettingProto accessibility_magnification_mode = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_magnification_mode = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto button_targets = 35 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto button_targets = 35 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_magnification_capability = 36 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_magnification_capability = 36 [ (android.privacy).dest = DEST_AUTOMATIC ];

        // Settings for accessibility button mode (navigation bar or floating action menu).

        // Settings for accessibility button related config

        optional SettingProto accessibility_button_mode = 37 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_button_mode = 37 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_floating_menu_size = 38 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_floating_menu_size = 38 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_floating_menu_icon_type = 39 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto accessibility_floating_menu_icon_type = 39 [ (android.privacy).dest = DEST_AUTOMATIC ];