Merge "[Safety Labels] Change notification header to say "Settings" instead of "Permission Controller"" into udc-dev

2 files changed, 21 insertions, 6 deletions

diff --git a/PermissionController/res/values-v34/styles.xml b/PermissionController/res/values-v34/styles.xml
index 326d58766..420f9536f 100644
--- a/PermissionController/res/values-v34/styles.xml
+++ b/PermissionController/res/values-v34/styles.xml
@@ -261,8 +261,6 @@
     <style name="AppDataSharingUpdateAppIconFrame">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:gravity">start|center_vertical</item>
-        <item name="android:orientation">horizontal</item>
         <item name="android:paddingRight">20dp</item>
     </style>
 
@@ -270,7 +268,7 @@
         <item name="android:id">@android:id/icon</item>
         <item name="android:layout_width">32dp</item>
         <item name="android:layout_height">32dp</item>
-        <item name="android:scaleType">fitCenter</item>
+        <item name="android:layout_gravity">center_vertical</item>
     </style>
 
     <style name="AppDataSharingUpdatePreferenceTitleAndSummaryContainer">
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
index 5b6c833d9..b289d4f38 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
@@ -17,6 +17,7 @@
 package com.android.permissioncontroller.permission.service.v34
 
 import android.Manifest
+import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -30,6 +31,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.ACTION_BOOT_COMPLETED
 import android.os.Build
+import android.os.Bundle
 import android.os.PersistableBundle
 import android.os.Process
 import android.os.UserHandle
@@ -55,6 +57,7 @@ import com.android.permissioncontroller.permission.model.livedatatypes.AppPermGr
 import com.android.permissioncontroller.permission.model.livedatatypes.AppPermGroupUiInfo.PermGrantState.PERMS_ALLOWED_FOREGROUND_ONLY
 import com.android.permissioncontroller.permission.model.v34.AppDataSharingUpdate
 import com.android.permissioncontroller.permission.utils.KotlinUtils
+import com.android.permissioncontroller.permission.utils.Utils
 import com.android.permissioncontroller.permission.utils.Utils.getSystemServiceSafe
 import com.android.permissioncontroller.safetylabel.AppsSafetyLabelHistory
 import com.android.permissioncontroller.safetylabel.AppsSafetyLabelHistory.AppInfo
@@ -412,7 +415,7 @@ class SafetyLabelChangesJobService : JobService() {
 
         val title = context.getString(R.string.safety_label_changes_notification_title)
         val text = context.getString(R.string.safety_label_changes_notification_desc)
-        val notification =
+        var notificationBuilder =
             NotificationCompat.Builder(context, PERMISSION_REMINDER_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_info)
                 .setContentTitle(title)
@@ -422,9 +425,23 @@ class SafetyLabelChangesJobService : JobService() {
                 .setAutoCancel(true)
                 .setSilent(true)
                 .setContentIntent(createIntentToOpenAppDataSharingUpdates(context))
-                .build()
 
-        notificationManager.notify(SAFETY_LABEL_CHANGES_NOTIFICATION_ID, notification)
+        val settingsAppLabel =
+            Utils.getSettingsLabelForNotifications(applicationContext.packageManager)
+        if (settingsAppLabel != null) {
+            notificationBuilder =
+                notificationBuilder
+                    .setSmallIcon(R.drawable.ic_settings_24dp)
+                    .addExtras(
+                        Bundle().apply {
+                            putString(
+                                Notification.EXTRA_SUBSTITUTE_APP_NAME, settingsAppLabel.toString())
+                        })
+        }
+
+        notificationManager.notify(
+            SAFETY_LABEL_CHANGES_NOTIFICATION_ID, notificationBuilder.build())
+
         if (DEBUG) {
             Log.v(LOG_TAG, "Safety label change notification sent.")
         }