diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2015-01-07 12:50:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 12:50:04 +0000 |
| commit | 8ada2c53b9322b7c95aff818e251cb31850ed124 (patch) | |
| tree | 275d75b1ed6c5feea7c86924af3b520e3ef6ba17 /src | |
| parent | c374175f61aff876f895cf15664ea66f54978aaf (diff) | |
| parent | 2399c4500c5801cead4ce89132751fd21551213a (diff) | |
| download | packages_apps_Settings-8ada2c53b9322b7c95aff818e251cb31850ed124.tar.gz packages_apps_Settings-8ada2c53b9322b7c95aff818e251cb31850ed124.tar.bz2 packages_apps_Settings-8ada2c53b9322b7c95aff818e251cb31850ed124.zip | |
am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '2399c4500c5801cead4ce89132751fd21551213a':
Add an item to "Legal information" screen for WebView license
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 6 |
1 files changed, 6 insertions, 0 deletions
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); } |