Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8 am: 8bf47584de am: 77dae23b10

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966

Change-Id: Ib1e3a066e02c0e75662adf7df1dd9350de4d2498
This commit is contained in:
Jason Chiu
2021-05-26 07:57:58 +00:00
committed by Automerger Merge Worker

View File

@@ -2116,6 +2116,8 @@
android:value="com.android.settings.category.ia.system" /> android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.summary" <meta-data android:name="com.android.settings.summary"
android:resource="@string/summary_empty"/> 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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" /> android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2585,6 +2587,8 @@
android:value="com.android.settings.category.ia.system" /> android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.summary_uri" <meta-data android:name="com.android.settings.summary_uri"
android:value="content://com.android.settings.dashboard.SummaryProvider/user" /> 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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.users.UserSettings" /> android:value="com.android.settings.users.UserSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -3289,6 +3293,8 @@
<!-- Tell Settings app which category it belongs to --> <!-- Tell Settings app which category it belongs to -->
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" /> 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"/> <meta-data android:name="com.android.settings.order" android:value="-60"/>
</activity> </activity>