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

Commit 23746be0 authored by Adrian Ludwig's avatar Adrian Ludwig Committed by Android (Google) Code Review
Browse files

Merge "Reorganizing permissions into groups oriented around... 

Merge "Reorganizing permissions into groups oriented around user-understandable concepts." into jb-dev
parents 43b8fd76 dc410cb3

api/current.txt

+18 −0
Original line number Diff line number Diff line
@@ -141,16 +141,34 @@ package android { 
  public static final class Manifest.permission_group {

    ctor public Manifest.permission_group();

    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";

    field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";

    field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";

    field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";

    field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";

    field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";

    field public static final java.lang.String COST_MONEY = "android.permission-group.COST_MONEY";

    field public static final java.lang.String DEVELOPMENT_TOOLS = "android.permission-group.DEVELOPMENT_TOOLS";

    field public static final java.lang.String DEVICE_ALARMS = "android.permission-group.DEVICE_ALARMS";

    field public static final java.lang.String DISPLAY = "android.permission-group.DISPLAY";

    field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";

    field public static final java.lang.String HARDWARE_CONTROLS = "android.permission-group.HARDWARE_CONTROLS";

    field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";

    field public static final java.lang.String MESSAGES = "android.permission-group.MESSAGES";

    field public static final java.lang.String MICROPHONE = "android.permission-group.MICROPHONE";

    field public static final java.lang.String NETWORK = "android.permission-group.NETWORK";

    field public static final java.lang.String PERSONAL_INFO = "android.permission-group.PERSONAL_INFO";

    field public static final java.lang.String PHONE_CALLS = "android.permission-group.PHONE_CALLS";

    field public static final java.lang.String SCREENLOCK = "android.permission-group.SCREENLOCK";

    field public static final java.lang.String SHORTRANGE_NETWORK = "android.permission-group.SHORTRANGE_NETWORK";

    field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO";

    field public static final java.lang.String STATUS_BAR = "android.permission-group.STATUS_BAR";

    field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";

    field public static final java.lang.String SYNC_SETTINGS = "android.permission-group.SYNC_SETTINGS";

    field public static final java.lang.String SYSTEM_CLOCK = "android.permission-group.SYSTEM_CLOCK";

    field public static final java.lang.String SYSTEM_TOOLS = "android.permission-group.SYSTEM_TOOLS";

    field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";

    field public static final java.lang.String VOICEMAIL = "android.permission-group.VOICEMAIL";

    field public static final java.lang.String WALLPAPER = "android.permission-group.WALLPAPER";

  }















  public final class R {

























core/res/AndroidManifest.xml



+518
−270


























File changed.
Preview size limit exceeded, changes collapsed.
























core/res/res/values/strings.xml



+85
−4




























Original line number
Diff line number
Diff line








@@ -390,11 +390,12 @@













    <!-- 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_personalInfo">Your personal 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. -->













    <string name="permgroupdesc_personalInfo" product="tablet">Direct access to your contacts













        and calendar stored on the tablet.</string>













    <string name="permgroupdesc_personalInfo">Direct access to information about you, stored in on your contact card.</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_socialInfo">Your social 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. -->













    <string name="permgroupdesc_personalInfo" product="default">Direct access to your contacts













        and calendar stored on the phone.</string>













    <string name="permgroupdesc_socialInfo">Direct access to information about your contacts and social connections.</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_location">Your location</string>









@@ -406,6 +407,81 @@













    <!-- 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_network">Access various network features.</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_shortRangeNetwork">Bluetooth and NFC</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_shortRangeNetwork">Access Bluetooth or NFC networks and devices.</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_audioSettings">Audio Settings</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_audioSettings">Change audio settings.</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_affectsBattery">Affects Battery</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_affectsBattery">Use features that can quickly drain battery.</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_calendar">Calendar</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_calendar">Direct access to calendar and events.</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_dictionary">User Dictionary</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_dictionary">Direct access to the user dictionary.</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_bookmarks">Bookmarks and History</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_bookmarks">Direct access to bookmarks and browser history.</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_deviceAlarms">Alarm</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_deviceAlarms">Set the alarm clock.</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_voicemail">Voicemail</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_voicemail">Direct access to voicemail.</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_microphone">Microphone</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_microphone">Direct access to the microphone to record audio.</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_camera">Camera</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_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_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. -->













    <string name="permgroupdesc_appInfo">Ability to affect behavior of other applications 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. -->













    <string name="permgrouplab_wallpaper">Wallpaper</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_wallpaper">Change the device wallpaper settings.</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_systemClock">Clock</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_systemClock">Change the device time or timezone.</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_statusBar">Status Bar</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_statusBar">Change the device status bar settings.</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_syncSettings">Sync Settings</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_syncSettings">Access to the sync settings.</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_accounts">Your accounts</string>















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









@@ -431,6 +507,11 @@













    <!-- 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_developmentTools">Features only needed for app developers.</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_display">Other Application UI</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_display">Effect the UI of other applications.</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_storage">Storage</string>















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