diff options
author | Philip P. Moltmann <moltmann@google.com> | 2020-08-20 19:50:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 19:50:24 +0000 |
commit | bc3dbc3564996b1e525f914e1cdcd2ca1d2b7a1b (patch) | |
tree | df7a3e2d8f8bbe7abb1b711da983723a3db1b692 /res | |
parent | f23eba4b9fb4ffbf770e697f20782a11873d7b6b (diff) | |
parent | 4b867486850c75ae98f07525df6558f6c9063295 (diff) | |
download | PackageInstaller-bc3dbc3564996b1e525f914e1cdcd2ca1d2b7a1b.tar.gz |
Merge changes from topic "phone-call-indicators" into rvc-qpr-dev am: 4b86748685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/12405542
Change-Id: Ie77a922fef4c625cbd0cbeb0b08a18cd25c929d1
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/ongoing_usage_dialog_content.xml | 17 | ||||
-rw-r--r-- | res/values/overlayable.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 17 | ||||
-rw-r--r-- | res/values/styles.xml | 26 |
4 files changed, 64 insertions, 0 deletions
diff --git a/res/layout/ongoing_usage_dialog_content.xml b/res/layout/ongoing_usage_dialog_content.xml index 219b4f9c0..f9a0f07f0 100644 --- a/res/layout/ongoing_usage_dialog_content.xml +++ b/res/layout/ongoing_usage_dialog_content.xml @@ -35,6 +35,23 @@ 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"/> + + <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 162744295..aa683a43e 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -153,6 +153,10 @@ <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" /> + <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 490817a2f..e7804ffb2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -884,6 +884,23 @@ <!-- 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> + <!-- 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>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>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> + <!-- 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..c1c8e2d2f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -663,6 +663,32 @@ <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> + + <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 --> |