diff options
| author | Joe Onorato <joeo@google.com> | 2019-05-22 03:16:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 03:16:44 +0000 |
| commit | 0ebde2fb1509c307601197f8a5b14e9254cc66bf (patch) | |
| tree | 2abbc4128dfec8d4691a5298afbf3a03601bb287 /res/values | |
| parent | c506eaaaec152bdb8f1f0dc33965a4bbd9dd8b62 (diff) | |
| parent | 2ea4955fcdc3698216c04519724b3cab50fd33ab (diff) | |
| download | android_packages_apps_PackageInstaller-0ebde2fb1509c307601197f8a5b14e9254cc66bf.tar.gz android_packages_apps_PackageInstaller-0ebde2fb1509c307601197f8a5b14e9254cc66bf.tar.bz2 android_packages_apps_PackageInstaller-0ebde2fb1509c307601197f8a5b14e9254cc66bf.zip | |
Merge "Show reason text from incident report in incident confirmation dialog." into qt-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index f8144d74..cc93effd 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -36,4 +36,5 @@ <!-- START: Car Settings Preferences --> <attr name="carDividerColor" format="color"/> <!-- END: Car Settings Preferences --> + </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index a5e85e16..277c8b8a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -19,4 +19,5 @@ <color name="bigIconColor">#C8CCCE</color> <color name="google_grey_800">#3C4043</color> <color name="system_notification_accent_color">#ff607D8B</color> + <color name="incident_reason_bullet_color">#de000000</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 04ec00ce..42c0fbec 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -53,6 +53,9 @@ <!-- Incident report confirmation --> <dimen name="incident_image_width">150dp</dimen> <dimen name="incident_image_height">200dp</dimen> + <dimen name="incident_reason_padding">32dp</dimen> + <dimen name="incident_reason_bullet_size">3dp</dimen> + <dimen name="incident_reason_bullet_indent">10dp</dimen> <!-- Auto related dimensions --> <dimen name="car_action_bar_height">@*android:dimen/car_app_bar_height</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index eaeaa4ea..8debf7fa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -815,6 +815,12 @@ <!-- Title for the incident / bug report confirmation dialog. [CHAR LIMIT=50] --> <string name="incident_report_dialog_title">Share Debugging Data</string> + <!-- Title text for introduction to incident / bug report confirmation dialog. + Following this text is a bulleted list of reasons that a bug is being collected (e.g. "bad + battery life detected"). Please try to keep this as short as possible (<40 chars if possible). + The dialog is getting full, but going over is ok if necessary. [CHAR LIMIT=60] --> + <string name="incident_report_dialog_intro">The system has detected a problem.</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. |