diff options
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/device_info_settings.xml | 7 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6815499bb..2e1477a0d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2691,6 +2691,9 @@ <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> <!-- About phone settings screen, setting option name to see terms and conditions --> <string name="terms_title">Terms and conditions</string> + <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> + <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] --> + <string name="webview_license_title">System WebView License</string> <!-- About phone settings screen, setting option name to see wallpapers attributions --> <string name="wallpaper_attributions">Wallpapers</string> <!-- About phone settings screen, setting option name to see wallpapers attributions values --> diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 45eda60eb..46992a45e 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -72,6 +72,13 @@ <intent android:action="android.settings.TERMS" /> </PreferenceScreen> + <!-- System WebView License information --> + <PreferenceScreen + android:key="webview_license" + android:title="@string/webview_license_title"> + <intent android:action="android.settings.WEBVIEW_LICENSE" /> + </PreferenceScreen> + <Preference android:key="wallpaper_attributions" android:title="@string/wallpaper_attributions" diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index b6d8fefe8..f79707a95 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -64,6 +64,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In private static final String KEY_TERMS = "terms"; private static final String KEY_LICENSE = "license"; private static final String KEY_COPYRIGHT = "copyright"; + private static final String KEY_WEBVIEW_LICENSE = "webview_license"; private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings"; private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal"; private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux"; @@ -144,6 +145,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT, Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); + Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE, + Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); // These are contained by the root preference screen parentPreference = getPreferenceScreen(); @@ -448,6 +451,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In if (!checkIntentAction(context, "android.settings.COPYRIGHT")) { keys.add(KEY_COPYRIGHT); } + if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) { + keys.add(KEY_WEBVIEW_LICENSE); + } if (UserHandle.myUserId() != UserHandle.USER_OWNER) { keys.add(KEY_SYSTEM_UPDATE_SETTINGS); } |