summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2018-12-11 14:17:36 -0800
committerJoe Onorato <joeo@google.com>2019-01-29 07:34:37 -0800
commit042d63c9decaaf0388e15311ceb8ed3f66e954d5 (patch)
tree0d6e4c51b34259587144496d1e71a2b9630e58c6 /res
parent5861b7b8233d76822ffb51eb18948be8045e3536 (diff)
downloadandroid_packages_apps_PackageInstaller-042d63c9decaaf0388e15311ceb8ed3f66e954d5.tar.gz
android_packages_apps_PackageInstaller-042d63c9decaaf0388e15311ceb8ed3f66e954d5.tar.bz2
android_packages_apps_PackageInstaller-042d63c9decaaf0388e15311ceb8ed3f66e954d5.zip
Add UI to approve incident and bug reports.
The data in incident and bug reports can be PII or even SPII, so PermissionController has the special responsibility to let the user give access to those. Bug: 123543706 Test: atest GooglePermissionControllerTest Change-Id: I9917c9c04316064b84bc3add2d9a75a8000aad10
Diffstat (limited to 'res')
-rw-r--r--res/drawable/ic_bug_report_black_24dp.xml26
-rw-r--r--res/values/strings.xml31
2 files changed, 55 insertions, 2 deletions
diff --git a/res/drawable/ic_bug_report_black_24dp.xml b/res/drawable/ic_bug_report_black_24dp.xml
new file mode 100644
index 00000000..fe7e443b
--- /dev/null
+++ b/res/drawable/ic_bug_report_black_24dp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"
+ android:fillColor="@android:color/white" />
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19c00d60..81e70595 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,9 +4,9 @@
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.
@@ -575,4 +575,31 @@
<!-- Dialog body explaining that the app just selected by the user will not work after a reboot until the user enters their credentials, such as a PIN or password. [CHAR LIMIT=NONE] -->
<string name="encryption_unaware_confirmation_message">Note: If you restart your device and have a screen lock set, this app can\u2019t start until you unlock your device.</string>
+
+ <!-- Name for the notification channel for incident / bug report confirmation
+ [CHAR LIMIT=50] -->
+ <string name="incident_report_channel_name">Share Debugging Data</string>
+
+ <!-- Title for notification shown when the user should confirm an incident / bug report.
+ [CHAR LIMIT=50] -->
+ <string name="incident_report_notification_title">Share detailed debugging data?</string>
+
+ <!-- Content for notification shown when the user should confirm an incident / bug report.
+ [CHAR LIMIT=120] -->
+ <string name="incident_report_notification_text"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> would like to upload debugging information.</string>
+
+ <!-- Title for the incident / bug report confirmation dialog [CHAR LIMIT=50] -->
+ <string name="incident_report_dialog_title">Share Debugging Data</string>
+
+ <!-- Content for dialog shown when the user should confirm an incident / bug report.
+ [CHAR LIMIT=none] -->
+ <string name="incident_report_dialog_text">"<xliff:g id="app_name" example="Gmail">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="date" example="December 26, 2018">%2$s</xliff:g> at <xliff:g id="time" example="1:20 PM">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information.
+
+Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug report?"</string>
+
+ <!-- Label for the button to allow sharing of the report. [CHAR LIMIT=20]-->
+ <string name="incident_report_dialog_allow_label">Allow</string>
+
+ <!-- Label for the button to NOT allow sharing of the report. [CHAR LIMIT=20] -->
+ <string name="incident_report_dialog_deny_label">Deny</string>
</resources>