diff options
| author | George Mount <mount@google.com> | 2012-08-20 13:37:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 13:37:55 -0700 |
| commit | 9af67e8f6c7dd98baa6232ff2cda97510b827637 (patch) | |
| tree | 0f3e974ef4972021c386d1c0c2527451f8597606 /core/java/android/webkit/WebViewClassic.java | |
| parent | df8ef4b139a8918895f8a5c62536123da06e81fe (diff) | |
| parent | 9f410c540ad593dd83e34266ccffd70867a600ab (diff) | |
| download | frameworks_base-9af67e8f6c7dd98baa6232ff2cda97510b827637.zip frameworks_base-9af67e8f6c7dd98baa6232ff2cda97510b827637.tar.gz frameworks_base-9af67e8f6c7dd98baa6232ff2cda97510b827637.tar.bz2 | |
Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index c816d5b..52048db 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -132,6 +132,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.Vector; @@ -1308,6 +1309,12 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc public WebViewDatabase getWebViewDatabase(Context context) { return WebViewDatabaseClassic.getInstance(context); } + + @Override + public String getDefaultUserAgent(Context context) { + return WebSettingsClassic.getDefaultUserAgentForLocale(context, + Locale.getDefault()); + } } private void onHandleUiEvent(MotionEvent event, int eventType, int flags) { |