Merge "Add rotary dismiss button to HUNs" into rvc-qpr-dev am: 2d871098d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Notification/+/12654725
Change-Id: I1edce13e48630af7232552b2e8604fd0f34263a2
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3eadb5d..dfb6ccb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,9 +17,9 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.notification">
+ package="com.android.car.notification">
<!-- Permission to show display overlay window for heads-up notifications -->
- <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
+ <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"/>
<!-- Permission to get the current user id to cancel a notification -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<!-- Permission to get the current user id to cancel all notifications -->
@@ -28,27 +28,28 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<!--Permission to talk to the Status bar service which proxies the calls to remove
- notifications to the notification service -->
- <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
+ notifications to the notification service -->
+ <uses-permission android:name="android.permission.STATUS_BAR_SERVICE"/>
<!--Permission to start a voice interaction service-->
<uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE"/>
<application android:name=".NotificationApplication">
- <activity
- android:name=".CarNotificationCenterActivity"
- android:theme="@style/Theme.DeviceDefault.NoActionBar.Notification"
- android:launchMode="singleInstance"
- android:noHistory="true"
- android:exported="true"
- android:stateNotNeeded="true">
- <meta-data android:name="distractionOptimized" android:value="true"/>
+ <activity android:name=".CarNotificationCenterActivity"
+ android:theme="@style/Theme.DeviceDefault.NoActionBar.Notification"
+ android:launchMode="singleInstance"
+ android:noHistory="true"
+ android:exported="true"
+ android:stateNotNeeded="true">
+ <meta-data android:name="distractionOptimized"
+ android:value="true"/>
</activity>
<service android:name=".CarNotificationListener"
- android:label="@string/notification_service_label"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
- android:directBootAware="true">
+ android:label="@string/notification_service_label"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+ android:directBootAware="true"
+ android:exported="true">
<intent-filter>
<action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e687e90..d06de6d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="assist_action_play_label" msgid="6278705468288338172">"Wiedergeben"</string>
<string name="action_mute_short" msgid="5239851786101022633">"Stummschalten"</string>
- <string name="action_mute_long" msgid="6846675719189989477">"Unterhaltung ignorieren"</string>
+ <string name="action_mute_long" msgid="6846675719189989477">"Unterhaltung stummschalten"</string>
<string name="action_unmute_short" msgid="7157822835069715986">"Stummschaltung aufheben"</string>
<string name="action_unmute_long" msgid="22482625837159466">"Unterhaltung nicht mehr stummschalten"</string>
<string name="action_canned_reply" msgid="4045960823021872834">"\"Ich fahre gerade.\""</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 99e3c5d..9cd514d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -29,10 +29,10 @@
<string name="notifications" msgid="2865534625906329283">"Ծանուցումների կենտրոն"</string>
<string name="clear_all" msgid="1845314281571237722">"Ջնջել բոլորը"</string>
<string name="ellipsized_string" msgid="6993649229498857557">"…"</string>
- <string name="show_more" msgid="7291378544926443344">"Ցույց տալ ավելի շատ"</string>
+ <string name="show_more" msgid="7291378544926443344">"Ցուցադրել ավելի շատ"</string>
<string name="notification_header" msgid="324550431063568049">"Ծանուցումներ"</string>
<string name="empty_notification_header" msgid="4928379791607839720">"Ծանուցումներ չկան"</string>
- <string name="show_less" msgid="7342677676229302829">"Ցույց տալ ավելի քիչ"</string>
+ <string name="show_less" msgid="7342677676229302829">"Ցուցադրել ավելի քիչ"</string>
<string name="show_count_more" msgid="480555295700318609">"Ցուցադրել ևս <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="message_unshown_count" msgid="2234421277246741233">" Եվս <xliff:g id="COUNT">%d</xliff:g>"</string>
<plurals name="restricted_message_text" formatted="false" msgid="507312322886633308">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index fb3895d..d82d53e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,7 +27,7 @@
<string name="toast_message_sent_success" msgid="1159956191974273064">"Mensagem enviada."</string>
<string name="notification_service_label" msgid="7512186049723777468">"Serviço de escuta de notificações do carro"</string>
<string name="notifications" msgid="2865534625906329283">"Central de notificações"</string>
- <string name="clear_all" msgid="1845314281571237722">"Excluir tudo"</string>
+ <string name="clear_all" msgid="1845314281571237722">"Limpar tudo"</string>
<string name="ellipsized_string" msgid="6993649229498857557">"…"</string>
<string name="show_more" msgid="7291378544926443344">"Mostrar mais"</string>
<string name="notification_header" msgid="324550431063568049">"Notificações"</string>
