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

Commit ef7b5d6d authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5503 

* changes:
  Update WebKit user agent.
parents cf906dec b4f33445

core/java/android/webkit/WebSettings.java

+6 −6
Original line number Diff line number Diff line
@@ -252,13 +252,13 @@ public class WebSettings { 


    // User agent strings.

    private static final String DESKTOP_USERAGENT =

            "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en)"

            + " AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2"

            + " Safari/525.20.1";

            "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us)"

            + " AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0"

            + " Safari/530.17";

    private static final String IPHONE_USERAGENT = 

            "Mozilla/5.0 (iPhone; U; CPU iPhone 2_1 like Mac OS X; en)"

            + " AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2"

            + " Mobile/5F136 Safari/525.20.1";

            "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us)"

            + " AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0"

            + " Mobile/7A341 Safari/528.16";

    private static Locale sLocale;

    private static Object sLockForLocaleSettings;

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ 


    <!-- Do not translate.  WebView User Agent string -->

    <string name="web_user_agent"><xliff:g id="x">Mozilla/5.0 (Linux; U; Android %s)

        AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1</xliff:g></string>

        AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17</xliff:g></string>



    <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->

    <string name="js_dialog_title">The page at \'<xliff:g id="title">%s</xliff:g>\' says:</string>