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

Commit c42a4493 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b2bf4ecd: am 71b00177: Merge "Fix issue #8410116: "Disable your screen... 

am b2bf4ecd: am 71b00177: Merge "Fix issue #8410116: "Disable your screen lock" permission..." into jb-mr2-dev

* commit 'b2bf4ecd':
  Fix issue #8410116: "Disable your screen lock" permission...
parents a383eba1 b2bf4ecd

core/res/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -1073,10 +1073,10 @@ 




    <!-- Group of permissions that are related to the screenlock. -->

    <!-- Group of permissions that are related to the screenlock. -->

    <permission-group android:name="android.permission-group.SCREENLOCK"

    <permission-group android:name="android.permission-group.SCREENLOCK"

        android:label="@string/permgrouplab_storage"

        android:label="@string/permgrouplab_screenlock"

        android:icon="@drawable/perm_group_screenlock"

        android:icon="@drawable/perm_group_screenlock"

        android:permissionGroupFlags="personalInfo"

        android:permissionGroupFlags="personalInfo"

        android:description="@string/permgroupdesc_storage"

        android:description="@string/permgroupdesc_screenlock"

        android:priority="230" />

        android:priority="230" />





    <!-- Allows applications to disable the keyguard -->

    <!-- Allows applications to disable the keyguard -->

core/res/res/values/strings.xml

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

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

    <string name="permgroupdesc_camera">Direct access to camera for image or video capture.</string>

    <string name="permgroupdesc_camera">Direct access to camera for image or video capture.</string>





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

    <string name="permgrouplab_screenlock">Lock screen</string>

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

    <string name="permgroupdesc_screenlock">Ability to affect behavior of the lock screen on your device.</string>



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

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

    <string name="permgrouplab_appInfo">Your applications information</string>

    <string name="permgrouplab_appInfo">Your applications information</string>

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

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