Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59f4d20b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev

parents 15e2c54a 71ef80ea

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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 -->

res/xml/device_info_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/DeviceInfoSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -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);

                }