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

Commit 4a8ed1c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add label for notification permission" into sc-dev am: 3f6f018c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I134830c58327fd5b02a4080879a8459e0364bd1c
parents e2ad2bdb 3f6f018c

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -5419,6 +5419,8 @@ 
         intents}.

         <p>Protection level: normal -->

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

                android:label="@string/permlab_fullScreenIntent"

                android:description="@string/permdesc_fullScreenIntent"

                android:protectionLevel="normal" />



    <!-- @SystemApi Allows requesting the framework broadcast the

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -889,6 +889,11 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_expandStatusBar">Allows the app to expand or collapse the status bar.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_fullScreenIntent">display notifications as full screen activities on a locked device</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_fullScreenIntent">Allows the app to display notifications as full screen activities on a locked device</string>



    <!-- Title of an application permission, listed so the user can install application shortcuts

    in their Launcher -->

    <string name="permlab_install_shortcut">install shortcuts</string>