PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 812819d48c

Change-Id: I1e910affc1333fbd752d0b38e8668c4d87c02188
This commit is contained in:
Fan Zhang
2017-04-13 21:15:44 +00:00
committed by android-build-merger
parent 18fe8176f6 812819d48c
commit 1ed4d2fc6c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@@ -166,7 +166,7 @@
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.network.NetworkDashboardFragment"/>
<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"
android:value="true" />
</activity>
@@ -193,7 +193,7 @@
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<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"
android:value="true" />
</activity>
@@ -877,7 +877,7 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
<meta-data android:name="com.android.settings.summary"
android:value="@string/display_dashboard_summary"/>
android:resource="@string/display_dashboard_summary"/>
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -2560,7 +2560,7 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
<meta-data android:name="com.android.settings.summary"
android:value="@string/sound_dashboard_summary"/>
android:resource="@string/sound_dashboard_summary"/>
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -2966,7 +2966,7 @@
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<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 android:name=".Settings$UserAndAccountDashboardActivity"
@@ -2998,7 +2998,7 @@
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.system.SystemDashboardFragment"/>
<meta-data android:name="com.android.settings.summary"
android:value="@string/system_dashboard_summary"/>
android:resource="@string/system_dashboard_summary"/>
</activity>
<activity android:name=".Settings$SupportDashboardActivity"