From 5f0fc1ff9178652f0c73ad91d6912965b5bcc7c2 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Mon, 24 May 2021 18:27:42 +0800
Subject: [PATCH] Add icon declaration in metadata for injected activities

Settings injection no longer supports auto-load the component icon when
metadata doesn't contain icon and icon_uri.

Copy the icon resource from the activity to metadata.

Bug: 186801104
Test: visual
Change-Id: I3a90bbb5e27eb0f4491d57b1412b14a326fca0a7
---
 AndroidManifest.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a21c4bb88ab..9ca7abbaa65 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2115,6 +2115,8 @@
                        android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/summary_empty"/>
+            <meta-data android:name="com.android.settings.icon"
+                       android:resource="@drawable/ic_settings_development" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2584,6 +2586,8 @@
                        android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.summary_uri"
                        android:value="content://com.android.settings.dashboard.SummaryProvider/user" />
+            <meta-data android:name="com.android.settings.icon"
+                       android:resource="@drawable/ic_settings_multiuser" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.users.UserSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -3288,6 +3292,8 @@
             <!-- Tell Settings app which category it belongs to -->
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.icon"
+                       android:resource="@drawable/ic_settings_backup" />
             <meta-data android:name="com.android.settings.order" android:value="-60"/>
         </activity>