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

Commit 92068bb0 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Revert settings proto of a11y recommended timeout."

parents bef82587 651bf6d1

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

+0 −5
Original line number Diff line number Diff line
@@ -72,11 +72,6 @@ message SecureSettingsProto { 
        // List of the accessibility services to which the user has granted

        // permission to put the device into touch exploration mode.

        optional SettingProto touch_exploration_granted_accessibility_services = 31;

        reserved 32; // minimum_ui_timeout_enabled

        reserved 33; // minimum_ui_timeout_ms

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

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



    }

    optional Accessibility accessibility = 2;

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

+0 −6
Original line number Diff line number Diff line
@@ -1648,12 +1648,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,

                SecureSettingsProto.Accessibility.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES);

        dumpSetting(s, p,

                Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS,

                SecureSettingsProto.Accessibility.NON_INTERACTIVE_UI_TIMEOUT_MS);

        dumpSetting(s, p,

                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS,

                SecureSettingsProto.Accessibility.INTERACTIVE_UI_TIMEOUT_MS);

        p.end(accessibilityToken);



        dumpSetting(s, p,