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

Commit 1acbca71 authored by Jared Finder's avatar Jared Finder Committed by Android (Google) Code Review
Browse files

Merge "Updating XR permission strings and icons to align with UX design" into main

parents c027a35c dcbe7e16
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -5296,6 +5296,7 @@
         @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) -->
    <permission-group android:name="android.permission-group.XR_TRACKING"
                      android:icon="@drawable/perm_group_xr_tracking"
                      android:label="@string/permgrouplab_xr_tracking"
                      android:description="@string/permgroupdesc_xr_tracking"
                      android:priority="100"
@@ -5355,6 +5356,7 @@
         @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) -->
    <permission-group android:name="android.permission-group.XR_EYE_SENSITIVE"
                      android:icon="@drawable/perm_group_xr_eye_sensitive"
                      android:label="@string/permgrouplab_xr_eye_sensitive"
                      android:description="@string/permgroupdesc_xr_eye_sensitive"
                      android:priority="100"
@@ -5377,6 +5379,7 @@
         @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) -->
    <permission-group android:name="android.permission-group.XR_TRACKING_SENSITIVE"
                      android:icon="@drawable/perm_group_xr_tracking_sensitive"
                      android:label="@string/permgrouplab_xr_tracking_sensitive"
                      android:description="@string/permgroupdesc_xr_tracking_sensitive"
                      android:priority="100"
+27 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2025 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:tint="?android:attr/colorControlNormal"
    android:viewportWidth="960"
    android:viewportHeight="960">

  <path
      android:fillColor="#000000"
      android:pathData="M240,920L120,920Q87,920 63.5,896.5T40,840L40,720h80v120L240,840v80ZM720,920v-80L840,840L840,720h80v120q0,33 -23.5,56.5T840,920L720,920ZM480,740q-120,0 -217.5,-71T120,480q45,-118 142.5,-189T480,220t217.5,71T840,480Q795,598 697.5,669T480,740ZM480,660q88,0 161,-48T753,480q-39,-84 -112,-132T480,300T319,348T207,480q39,84 112,132t161,48ZM480,620q58,0 99,-41t41,-99t-41,-99t-99,-41t-99,41t-41,99t41,99t99,41ZM480,540q-25,0 -42.5,-17.5T420,480t17.5,-42.5T480,420t42.5,17.5T540,480t-17.5,42.5T480,540ZM40,240L40,120q0,-33 23.5,-56.5T120,40L240,40v80L120,120v120L40,240ZM840,240L840,120L720,120v-80L840,40q33,0 56.5,23.5T920,120v120L840,240ZM480,480Z"/>
</vector>
+27 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2025 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:tint="?android:attr/colorControlNormal"
    android:viewportWidth="960"
    android:viewportHeight="960">

  <path
      android:fillColor="#000000"
      android:pathData="M480,160q134,0 227,93t93,227T707,707T480,800T253,707T160,480t93,-227t227,-93ZM480,720q100,0 170,-70t70,-170T650,310T480,240T310,310T240,480t70,170t170,70ZM480,620q48,0 86,-27.5T620,520L340,520q16,45 54,72.5T480,620ZM340,400q0,17 11.5,28.5T380,440t28.5,-11.5T420,400t-11.5,-28.5T380,360t-28.5,11.5T340,400ZM540,400q0,17 11.5,28.5T580,440t28.5,-11.5T620,400t-11.5,-28.5T580,360t-28.5,11.5T540,400ZM40,240L40,120q0,-33 23.5,-56.5T120,40L240,40v80L120,120v120L40,240ZM240,920L120,920Q87,920 63.5,896.5T40,840L40,720h80v120L240,840v80ZM720,920v-80L840,840L840,720h80v120q0,33 -23.5,56.5T840,920L720,920ZM840,240L840,120L720,120v-80L840,40q33,0 56.5,23.5T920,120v120L840,240ZM480,480Z"/>
</vector>
+27 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2025 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:tint="?android:attr/colorControlNormal"
    android:viewportWidth="960"
    android:viewportHeight="960">

    <path
      android:fillColor="#000000"
      android:pathData="M480,520q-66,0 -113,-47T320,360t47,-113t113,-47t113,47t47,113T593,473T480,520ZM160,840L160,728q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18t141,18t115,44q30,15 47,44t17,62v112L160,840ZM240,760L720,760v-32q0,-11 -5.5,-20T700,694q-36,-18 -92.5,-36T480,640T352.5,658T260,694q-9,5 -14.5,14T240,728v32ZM480,440q33,0 56.5,-23.5T560,360t-23.5,-56.5T480,280t-56.5,23.5T400,360t23.5,56.5T480,440ZM39,200v-80q17,0 31,-6.5T95,96t17,-25t6,-31h81q0,33 -12.5,62T152,153t-51,34.5T39,200ZM39,361v-80q51,0 94.5,-19T209,210t51,-76.5T279,40h81q0,66 -25,124.5T266,267T164,336T39,361ZM920,361q-66,0 -124.5,-25T693,267T624,164.5T599,40h80q0,50 19,93.5T750,210t76.5,52T920,281v80ZM920,200q-33,0 -62,-12.5T807,153t-34.5,-51T760,40h80q0,17 6.5,31T864,96t25,17.5t31,6.5v80ZM480,360ZM480,760Z"/>
</vector>
+22 −22
Original line number Diff line number Diff line
@@ -1062,19 +1062,19 @@
    <string name="permgroupdesc_notifications">show notifications</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_xr_eye_sensitive">XR sensitive eye tracking data</string>
    <string name="permgrouplab_xr_eye_sensitive">Eye tracking data</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=NONE]-->
    <string name="permgroupdesc_xr_eye_sensitive">access sensitive eye gaze data</string>
    <string name="permgroupdesc_xr_eye_sensitive">precisely track eye movement</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_xr_tracking">XR tracking data</string>
    <string name="permgrouplab_xr_tracking">Movement and area data</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=NONE]-->
    <string name="permgroupdesc_xr_tracking">access XR data about you and the environment around you</string>
    <string name="permgroupdesc_xr_tracking">track eyes, face, body, and scan area</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_xr_tracking_sensitive">Sensitive XR tracking data</string>
    <string name="permgrouplab_xr_tracking_sensitive">Precise head movement and area data</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=NONE]-->
    <string name="permgroupdesc_xr_tracking_sensitive">access sensitive tracking data about you and the environment around you</string>
    <string name="permgroupdesc_xr_tracking_sensitive">precisely track head and scan area</string>
    <!-- Title for the capability of an accessibility service to retrieve window content. -->
    <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>
@@ -1945,44 +1945,44 @@
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_mediaLocation">Allows the app to read locations from your media collection.</string>
    <string name="permlab_eye_tracking_coarse">track your approximate eye gaze</string>
    <string name="permlab_eye_tracking_coarse">track eye movement</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_eye_tracking_coarse">Allows the app to track your approximate eye gaze.</string>
    <string name="permdesc_eye_tracking_coarse">Allows the app to track the approximate direction of your gaze.</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_eye_tracking_fine">track where you are looking</string>
    <string name="permlab_eye_tracking_fine">precisely track eye movement</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_eye_tracking_fine">Allows the app to access precise eye gaze data.</string>
    <string name="permdesc_eye_tracking_fine">Allows the app to track the direction of your gaze.</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_face_tracking">track your face</string>
    <string name="permlab_face_tracking">track facial movements</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_face_tracking">Allows the app to access face tracking data.</string>
    <string name="permdesc_face_tracking">Allows the app to track your facial movements and expressions.</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_hand_tracking">track your hands</string>
    <string name="permlab_hand_tracking">track hand movements</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_hand_tracking">Allows the app to access hand tracking data.</string>
    <string name="permdesc_hand_tracking">Allows the app to track your hand movements.</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_head_tracking">track your head</string>
    <string name="permlab_head_tracking">track head movements</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_head_tracking">Allows the app to access head tracking data.</string>
    <string name="permdesc_head_tracking">Allows the app to track your head movements.</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_scene_understanding_coarse">understand your immediate environment</string>
    <string name="permlab_scene_understanding_coarse">scan your surrounding area</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_scene_understanding_coarse">Allows the app to access tracking data about the environment directly around you.</string>
    <string name="permdesc_scene_understanding_coarse">Allows the app to scan your surroundings.</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_scene_understanding_fine">understand your immediate environment at high detail</string>
    <string name="permlab_scene_understanding_fine">precisely scan your surrounding area</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_scene_understanding_fine">Allows the app to access tracking data about the environment directly around you with very high detail.</string>
    <string name="permdesc_scene_understanding_fine">Allows the app to precisely scan your surroundings.</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_xr_tracking_in_background">access XR data while not in the foreground</string>
    <string name="permlab_xr_tracking_in_background">track XR data in the background</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_xr_tracking_in_background">Allows the app to access XR data while not in the foreground.</string>
    <string name="permdesc_xr_tracking_in_background">Allows the app to access XR data in the background.</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_capture_keyboard">capture keys</string>