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

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

Merge "Add new description to Permission manager in settings" into rvc-dev

parents eef7b5e7 a1933458

res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -9491,6 +9491,9 @@ 
    <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->

    <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->

    <string name="runtime_permissions_summary_no_permissions_requested">No permissions requested</string>

    <string name="runtime_permissions_summary_no_permissions_requested">No permissions requested</string>




















    <!-- Runtime permissions preference summary, which describes what the permission manager does. [CHAR LIMIT=40] -->














    <string name="runtime_permissions_summary_control_app_access">Control app access to your data</string>
























    <!-- Label for showing all apps in list [CHAR LIMIT=30] -->







    <!-- Label for showing all apps in list [CHAR LIMIT=30] -->











    <string name="filter_all_apps">All apps</string>







    <string name="filter_all_apps">All apps</string>











    <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->







    <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->

























res/xml/app_and_notification.xml



+2
−2






























Original line number
Original line
Diff line number
Diff line








@@ -77,9 +77,9 @@









    <Preference







    <Preference











        android:key="manage_perms"







        android:key="manage_perms"











        android:title="@string/app_permissions"







        android:title="@string/app_permissions"














        android:summary="@string/runtime_permissions_summary_control_app_access"











        android:order="12"







        android:order="12"











        settings:keywords="@string/keywords_app_permissions"







        settings:keywords="@string/keywords_app_permissions">











        settings:controller="com.android.settings.applications.AppPermissionsPreferenceController">














        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>







        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>











    </Preference>







    </Preference>





















































res/xml/privacy_dashboard_settings.xml



+2
−3






























Original line number
Original line
Diff line number
Diff line








@@ -52,10 +52,9 @@









    <Preference







    <Preference











        android:key="privacy_manage_perms"







        android:key="privacy_manage_perms"











        android:title="@string/app_permissions"







        android:title="@string/app_permissions"











        android:summary="@string/summary_placeholder"







        android:summary="@string/runtime_permissions_summary_control_app_access"











        settings:allowDividerAbove="true"







        settings:allowDividerAbove="true"











        settings:searchable="false"







        settings:searchable="false">











        settings:controller="com.android.settings.applications.AppPermissionsPreferenceController">














        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>







        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>











    </Preference>







    </Preference>