summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-11-18 00:17:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-18 00:17:09 +0000
commitf8ad711b3a7870dcfa86dade2edd1cc34c949934 (patch)
treebf00575de0c1d69835fdf721cc317e216337e154
parentc183a1949d3134f3694c5af5cfa912768e45b91b (diff)
parentba44bd37303b22f1bb4a354c676fdb25cc4abf9b (diff)
Merge "Change "ask every time" in photo settings to "allow limited access"" into udc-mainline-prod
-rw-r--r--PermissionController/res/layout/app_permission.xml2
-rw-r--r--PermissionController/res/values/strings.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/PermissionController/res/layout/app_permission.xml b/PermissionController/res/layout/app_permission.xml
index 6520d79fa..042cc7130 100644
--- a/PermissionController/res/layout/app_permission.xml
+++ b/PermissionController/res/layout/app_permission.xml
@@ -107,7 +107,7 @@
<RadioButton
android:id="@+id/select_radio_button"
- android:text="@string/app_permission_button_ask"
+ android:text="@string/grant_dialog_button_allow_limited_access"
android:layout_alignParentStart="true"
style="@style/AppPermissionRadioButton"
android:layout_marginTop="0dp" />
diff --git a/PermissionController/res/values/strings.xml b/PermissionController/res/values/strings.xml
index bfb6e09b5..f08d971cb 100644
--- a/PermissionController/res/values/strings.xml
+++ b/PermissionController/res/values/strings.xml
@@ -75,6 +75,7 @@
<!-- Title for the dialog button to allow limited access. [CHAR LIMIT=60] -->
<string name="grant_dialog_button_allow_limited_access">Allow limited access</string>
+ <!-- TODO: b/310657469 add app_permission version of this string -->
<!-- Title for the dialog button to allow access to select photos to be shared. [CHAR LIMIT=60] -->
<string name="grant_dialog_button_allow_selected_photos">Select photos and videos</string>