Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0fc1ff authored by Jason Chiu's avatar Jason Chiu
Browse files

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
parent 5e92366f

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>