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

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

Merge "Add setting and permission for assist gesture"

parents 644d313b cfd641e8

core/java/android/provider/Settings.java

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

        public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";



        /**

         * Whether Assist Gesture Deferred Setup has been completed

         *

         * @hide

         */

        public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete";



        /**

         * Control whether Night display is currently activated.

         * @hide

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,10 @@ 
    <permission android:name="android.permission.MANAGE_USERS"

        android:protectionLevel="signature|privileged" />



    <!-- @hide Allows an application to configure the assist gesture -->

    <permission android:name="android.permission.CONFIGURE_ASSIST_GESTURE"

        android:protectionLevel="signature" />



    <!-- @hide Allows an application to create, remove users and get the list of

         users on the device. Applications holding this permission can only create restricted,

         guest, managed, demo, and ephemeral users. For creating other kind of users,

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -4085,6 +4085,11 @@ message MetricsEvent { 
    // Open: Settings > Search > No Result View

    SETTINGS_SEARCH_NO_RESULT = 1011;



    // OPEN: Assist Gesture before training

    // CATEGORY: SETTINGS

    // OS: O DR

    SETTINGS_ASSIST_GESTURE_FIRST_TIME = 1012;



    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS

  }