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

Commit 48a16ce3 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "moved target_content user agent parameter to strings added target... 

Merge "moved target_content user agent parameter to strings added target content parameter for xlarge screen configuration"
parents 17350886 37b64de6

core/java/android/webkit/WebSettings.java

+3 −5
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ package android.webkit; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.os.Build;

import android.os.Handler;

import android.os.Message;

import android.util.EventLog;

import java.lang.SecurityException;



import java.util.Locale;



/**
@@ -433,9 +432,8 @@ public class WebSettings { 
            buffer.append(" Build/");

            buffer.append(id);

        }

        String mobile = ((mContext.getResources().getConfiguration().screenLayout

                & Configuration.SCREENLAYOUT_SIZE_MASK)

                == Configuration.SCREENLAYOUT_SIZE_XLARGE) ? "" : "Mobile ";

        String mobile = mContext.getResources().getText(

            com.android.internal.R.string.web_user_agent_target_content).toString();

        final String base = mContext.getResources().getText(

                com.android.internal.R.string.web_user_agent).toString();

        return String.format(base, buffer, mobile);

core/res/res/values-xlarge/strings.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Do not translate.  WebView User Agent targeted content -->

    <string name="web_user_agent_target_content" translatable="false"></string>



</resources>
 
 No newline at end of file

core/res/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,9 @@ 


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

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

        AppleWebKit/534.3 (KHTML, like Gecko) Version/4.0 <xliff:g id="mobile">%s</xliff:g>Safari/534.3</string>

        AppleWebKit/534.1 (KHTML, like Gecko) Version/4.0 <xliff:g id="mobile">%s</xliff:g>Safari/534.1</string>

    <!-- Do not translate.  WebView User Agent targeted content -->

    <string name="web_user_agent_target_content" translatable="false">"Mobile "</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>