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

Commit 812819d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use android:resource instead of :value for static summary" into oc-dev

parents 8da75be8 26d40567

AndroidManifest.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.network.NetworkDashboardFragment"/>

                android:value="com.android.settings.network.NetworkDashboardFragment"/>

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                android:value="@string/network_dashboard_summary"/>

                android:resource="@string/network_dashboard_summary"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -193,7 +193,7 @@ 
            <meta-data android:name="com.android.settings.category"

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage"/>

                android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                android:value="@string/connected_devices_dashboard_summary"/>

                android:resource="@string/connected_devices_dashboard_summary"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -877,7 +877,7 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                android:value="@string/display_dashboard_summary"/>

                android:resource="@string/display_dashboard_summary"/>

        </activity>

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <!-- Keep compatibility with old shortcuts. -->
@@ -2560,7 +2560,7 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                android:value="@string/sound_dashboard_summary"/>

                android:resource="@string/sound_dashboard_summary"/>

        </activity>

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <!-- Keep compatibility with old shortcuts. -->
@@ -2966,7 +2966,7 @@ 
            <meta-data android:name="com.android.settings.category"

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                       android:value="@string/app_and_notification_dashboard_summary"/>

                       android:resource="@string/app_and_notification_dashboard_summary"/>

        </activity>

        </activity>





        <activity android:name=".Settings$UserAndAccountDashboardActivity"

        <activity android:name=".Settings$UserAndAccountDashboardActivity"
@@ -2998,7 +2998,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.system.SystemDashboardFragment"/>

                       android:value="com.android.settings.system.SystemDashboardFragment"/>

            <meta-data android:name="com.android.settings.summary"

            <meta-data android:name="com.android.settings.summary"

                       android:value="@string/system_dashboard_summary"/>

                       android:resource="@string/system_dashboard_summary"/>

        </activity>

        </activity>





        <activity android:name=".Settings$SupportDashboardActivity"

        <activity android:name=".Settings$SupportDashboardActivity"