From 71ef80eaf4f65e6d22bf807e1d029e177b57db11 Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Mon, 15 Dec 2014 17:09:50 +0000
Subject: [PATCH] Add an item to "Legal information" screen for WebView license

Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.

Bug: 18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
---
 res/values/strings.xml                           | 3 +++
 res/xml/device_info_settings.xml                 | 7 +++++++
 src/com/android/settings/DeviceInfoSettings.java | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 74062aede13..e9080b9a0c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2687,6 +2687,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 45eda60eb83..46992a45eab 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 b6d8fefe847..f79707a952a 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);
                 }