diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-09-04 17:01:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 17:01:16 +0000 |
| commit | 5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6 (patch) | |
| tree | fcba9c66681a8490c14e07378b34b195c57cabc5 /res/xml | |
| parent | ee846f8828f9e2988e646af85da55f3d51c02f27 (diff) | |
| parent | add95b150212befa92be230013f18bf77541b8c1 (diff) | |
| download | packages_apps_Settings-5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6.zip packages_apps_Settings-5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6.tar.gz packages_apps_Settings-5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6.tar.bz2 | |
Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/device_info_settings.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index c9a9a48..2c47c40 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -72,8 +72,14 @@ <intent android:action="android.settings.TERMS" /> </PreferenceScreen> + <Preference + android:key="wallpaper_attributions" + android:title="@string/wallpaper_attributions" + android:summary="@string/wallpaper_attributions_values" + /> + </PreferenceScreen> - + <PreferenceScreen android:key="safetylegal" android:title="@string/settings_safetylegal_title"> |