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

Commit bec3e011 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Update with new assist app ops."

parents 4e0fc628 7781ef68

res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -618,6 +618,9 @@ 
        <item>mute/unmute microphone</item>

        <item>project media</item>

        <item>activate VPN</item>

        <item>write wallpaper</item>

        <item>assist structure</item>

        <item>assist screenshot</item>

    </string-array>



    <!-- User display names for app ops codes -->
@@ -669,6 +672,9 @@ 
        <item>Mute/unmute microphone</item>

        <item>Project media</item>

        <item>Activate VPN</item>

        <item>Write wallpaper</item>

        <item>Assist structure</item>

        <item>Assist screenshot</item>

    </string-array>



    <!-- Titles for the list of long press timeout options. -->

src/com/android/settings/applications/AppOpsState.java

+6 −2
Original line number Diff line number Diff line
@@ -191,7 +191,9 @@ public class AppOpsState { 
                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,

                    AppOpsManager.OP_WAKE_LOCK,

                    AppOpsManager.OP_PROJECT_MEDIA,

                    AppOpsManager.OP_ACTIVATE_VPN, },

                    AppOpsManager.OP_ACTIVATE_VPN,

                    AppOpsManager.OP_ASSIST_STRUCTURE,

                    AppOpsManager.OP_ASSIST_SCREENSHOT},

            new boolean[] { false,

                    true,

                    true,
@@ -199,7 +201,9 @@ public class AppOpsState { 
                    true,

                    true,

                    false,

                    false, }

                    false,

                    false,

                    false }

            );



    public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {