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

Commit b5e29698 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Android (Google) Code Review
Browse files

Merge "Add physical activity recognition permission and group"

parents 74279bd7 72baeaf1

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android { 
    field public static final java.lang.String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";

    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final java.lang.String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION";

    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";

    field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";

    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
@@ -168,6 +169,7 @@ package android { 














  public static final class Manifest.permission_group {















    ctor public Manifest.permission_group();













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















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















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















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

























core/res/AndroidManifest.xml



+22
−0




























Original line number
Diff line number
Diff line








@@ -1149,6 +1149,28 @@













        android:description="@string/permdesc_recordAudio"















        android:protectionLevel="dangerous|instant"/>





























    <!-- ====================================================================== -->













    <!-- Permissions for activity recognition                        -->













    <!-- ====================================================================== -->













    <eat-comment />



























    <!-- Used for permissions that are associated with activity recognition.













         TODO(zezeozue). STOPSHIP: Add icon -->













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













        android:label="@string/permgrouplab_activityRecognition"













        android:description="@string/permgroupdesc_activityRecognition"













        android:request="@string/permgrouprequest_activityRecognition"













        android:priority="1000" />



























    <!-- Allows an application to recognize physical activity.













         <p>Protection level: dangerous













    -->













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













        android:permissionGroup="android.permission-group.ACTIVITY_RECOGNITION"













        android:label="@string/permlab_activityRecognition"













        android:description="@string/permdesc_activityRecognition"













        android:protectionLevel="dangerous|instant" />





























    <!-- ====================================================================== -->















    <!-- Permissions for accessing the UCE Service                              -->















    <!-- ====================================================================== -->

































core/res/res/values/strings.xml



+13
−0




























Original line number
Diff line number
Diff line








@@ -734,6 +734,14 @@













    <string name="permgrouprequest_microphone">Allow















        &lt;b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b> 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. [CHAR LIMIT=40]-->













    <string name="permgrouplab_activityRecognition">Activity recognition</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=40]-->













    <string name="permgroupdesc_activityRecognition">recognize activity</string>













    <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] -->













    <string name="permgrouprequest_activityRecognition">Allow













        &lt;b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b> to recognize your physical activity?</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. -->










@@ -1151,6 +1159,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_sim_communication">Allows the app to send commands to the SIM. This is very dangerous.</string>





























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













    <string name="permlab_activityRecognition">recognize physical activity</string>













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













    <string name="permdesc_activityRecognition">This app can recognize your physical activity.</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_camera">take pictures and videos</string>















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