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

am 8ada2c53: am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev

Browse Source 
* commit '8ada2c53b9322b7c95aff818e251cb31850ed124':
  Add an item to "Legal information" screen for WebView license
This commit is contained in:
Mikhail Naganov
2015-01-07 12:56:04 +00:00
committed by Android Git Automerger
parent 9de861247f 8ada2c53b9
commit 6a3ccd176f
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -2691,6 +2691,9 @@
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> <!-- 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 --> <!-- About phone settings screen, setting option name to see terms and conditions -->
<string name="terms_title">Terms and conditions</string> <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 --> <!-- About phone settings screen, setting option name to see wallpapers attributions -->
<string name="wallpaper_attributions">Wallpapers</string> <string name="wallpaper_attributions">Wallpapers</string>
<!-- About phone settings screen, setting option name to see wallpapers attributions values --> <!-- About phone settings screen, setting option name to see wallpapers attributions values -->

7
res/xml/device_info_settings.xml
View File

@@ -72,6 +72,13 @@
<intent android:action="android.settings.TERMS" /> <intent android:action="android.settings.TERMS" />
</PreferenceScreen> </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 <Preference
android:key="wallpaper_attributions" android:key="wallpaper_attributions"
android:title="@string/wallpaper_attributions" android:title="@string/wallpaper_attributions"

6
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -64,6 +64,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
private static final String KEY_TERMS = "terms"; private static final String KEY_TERMS = "terms";
private static final String KEY_LICENSE = "license"; private static final String KEY_LICENSE = "license";
private static final String KEY_COPYRIGHT = "copyright"; 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 KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal"; private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux"; 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.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT, Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,
Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); 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 // These are contained by the root preference screen
parentPreference = getPreferenceScreen(); parentPreference = getPreferenceScreen();
@@ -448,6 +451,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
if (!checkIntentAction(context, "android.settings.COPYRIGHT")) { if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {
keys.add(KEY_COPYRIGHT); keys.add(KEY_COPYRIGHT);
} }
if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {
keys.add(KEY_WEBVIEW_LICENSE);
}
if (UserHandle.myUserId() != UserHandle.USER_OWNER) { if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
keys.add(KEY_SYSTEM_UPDATE_SETTINGS); keys.add(KEY_SYSTEM_UPDATE_SETTINGS);
} }