diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-08-18 14:45:10 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2020-08-18 20:03:10 -0700 |
| commit | fa51a6e20487c3cf4e552614eba47e9e5be70446 (patch) | |
| tree | 019ed78d8cbc0713d52be2a0d81eae9367da5fa3 /res | |
| parent | 01cea2ff1535554e86af008a4cd5d13a1a7f492f (diff) | |
| download | PackageInstaller-fa51a6e20487c3cf4e552614eba47e9e5be70446.tar.gz | |
Show some limited system usage in ongoing usage dialog
Bug: 162547999
Test: Created system usage and then started dialog
Change-Id: I96e9a3ed34a4f48f4c1f74b1f5feb32dba055f75
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/ongoing_usage_dialog_content.xml | 8 | ||||
| -rw-r--r-- | res/values/overlayable.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 11 | ||||
| -rw-r--r-- | res/values/styles.xml | 12 |
4 files changed, 31 insertions, 2 deletions
diff --git a/res/layout/ongoing_usage_dialog_content.xml b/res/layout/ongoing_usage_dialog_content.xml index 100c9d7a0..f9a0f07f0 100644 --- a/res/layout/ongoing_usage_dialog_content.xml +++ b/res/layout/ongoing_usage_dialog_content.xml @@ -44,6 +44,14 @@ android:id="@+id/other_use_content" style="@style/PermissionUsageDialogOtherUseContent"/> + <View + android:id="@+id/other_use_inside_spacer" + style="@style/PermissionUsageDialogOtherUseInsideSpacer"/> + + <TextView + android:id="@+id/system_use_content" + style="@style/PermissionUsageDialogSystemUseContent"/> + </LinearLayout> </ScrollView> diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 0a0f9761f..aa683a43e 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -155,6 +155,8 @@ <item type="style" name="PermissionUsageDialogItemIconsContainer" /> <item type="style" name="PermissionUsageDialogOtherUseHeader" /> <item type="style" name="PermissionUsageDialogOtherUseContent" /> + <item type="style" name="PermissionUsageDialogOtherUseInsideSpacer" /> + <item type="style" name="PermissionUsageDialogSystemUseContent" /> <!-- END ONGOING USAGE DIALOG --> <!-- START REQUEST ROLE DIALOG TITLE --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 653e2144a..e7804ffb2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -887,9 +887,16 @@ <!-- Message telling the user that a phone call is currently using the microphone [CHAR LIMIT=none] --> <string name="phone_call_uses_microphone">Microphone is used in <b>phone call</b></string> <!-- Message telling the user that a phone call is currently using the microphone and the camera [CHAR LIMIT=none] --> - <string name="phone_call_uses_microphone_and_camera">Camera and Microphone are used in <b>phone call</b></string> + <string name="phone_call_uses_microphone_and_camera">Camera and Microphone are used in <b>video call</b></string> <!-- Message telling the user that a phone call is currently using the camera [CHAR LIMIT=none] --> - <string name="phone_call_uses_camera">Camera is used in <b>phone call</b></string> + <string name="phone_call_uses_camera">Camera is used in <b>video call</b></string> + + <!-- Message telling the user that a system service is currently using the microphone [CHAR LIMIT=none] --> + <string name="system_uses_microphone">Microphone is accessed using system service</string> + <!-- Message telling the user that a system service is currently using the microphone and the camera [CHAR LIMIT=none] --> + <string name="system_uses_microphone_and_camera">Camera and Microphone are accessed using system service</string> + <!-- Message telling the user that a system service is currently using the camera [CHAR LIMIT=none] --> + <string name="system_uses_camera">Camera is accessed using system service</string> <!-- Line above a list of other apps and system service that are currently microphone or camera [CHAR LIMIT=60] --> <string name="other_use">Other use:</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index b269a4c00..c1c8e2d2f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -677,6 +677,18 @@ <item name="android:layout_marginStart">16dp</item> </style> + <style name="PermissionUsageDialogOtherUseInsideSpacer"> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">16dp</item> + </style> + + <style name="PermissionUsageDialogSystemUseContent"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textAppearance">?android:textAppearanceListItemSecondary</item> + <item name="android:layout_marginStart">16dp</item> + </style> + <!-- END ONGOING USAGE DIALOG --> <!-- START REQUEST ROLE DIALOG TITLE --> |