diff options
author | Philip P. Moltmann <moltmann@google.com> | 2020-08-17 20:28:54 -0700 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2020-08-18 20:03:10 -0700 |
commit | 01cea2ff1535554e86af008a4cd5d13a1a7f492f (patch) | |
tree | 1fa27e7bd2ac0768e4e147fc95b122f49a4c748e /res | |
parent | bcb4ad88f2309b4c033d6f95278c764db57bdfdc (diff) | |
download | PackageInstaller-01cea2ff1535554e86af008a4cd5d13a1a7f492f.tar.gz |
Update to latests UI mocks.
Bug: 162547999
Test: Looked at UI
Change-Id: I8660671a6f2d68bc5c86d45474d4c883d7daa462
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/ongoing_usage_dialog_content.xml | 9 | ||||
-rw-r--r-- | res/values/overlayable.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 12 | ||||
-rw-r--r-- | res/values/styles.xml | 14 |
4 files changed, 34 insertions, 3 deletions
diff --git a/res/layout/ongoing_usage_dialog_content.xml b/res/layout/ongoing_usage_dialog_content.xml index 219b4f9c0..100c9d7a0 100644 --- a/res/layout/ongoing_usage_dialog_content.xml +++ b/res/layout/ongoing_usage_dialog_content.xml @@ -35,6 +35,15 @@ android:id="@+id/items_container" style="@style/PermissionUsageDialogItemsContainer"/> + <TextView + android:id="@+id/other_use_header" + android:text="@string/other_use" + style="@style/PermissionUsageDialogOtherUseHeader"/> + + <TextView + android:id="@+id/other_use_content" + style="@style/PermissionUsageDialogOtherUseContent"/> + </LinearLayout> </ScrollView> diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 162744295..0a0f9761f 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -153,6 +153,8 @@ <item type="style" name="PermissionUsageDialogItemAppName" /> <item type="style" name="PermissionUsageDialogItemPermissionsList" /> <item type="style" name="PermissionUsageDialogItemIconsContainer" /> + <item type="style" name="PermissionUsageDialogOtherUseHeader" /> + <item type="style" name="PermissionUsageDialogOtherUseContent" /> <!-- END ONGOING USAGE DIALOG --> <!-- START REQUEST ROLE DIALOG TITLE --> diff --git a/res/values/strings.xml b/res/values/strings.xml index d585f6364..653e2144a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -884,9 +884,15 @@ <!-- Label for the button to set an application as the default application [CHAR LIMIT=20] --> <string name="request_role_set_as_default">Set as default</string> - <string name="phone_call">Phone Call</string> - - <string name="video_call">Video Call</string> + <!-- 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> + <!-- 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> + + <!-- 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> <!-- Action for accepting the Ongoing usage dialog [CHAR LIMIT=10]--> <string name="ongoing_usage_dialog_ok">Got it</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 496e95cb9..b269a4c00 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -663,6 +663,20 @@ <item name="android:layout_gravity">end</item> </style> + <style name="PermissionUsageDialogOtherUseHeader"> + <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> + + <style name="PermissionUsageDialogOtherUseContent"> + <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 --> |