| f440831d76817e837164ca18c7705e81d2391f87 |
|
22-Mar-2011 |
Huahui Wu <hwu@google.com> |
DO NOT MERGE
b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread
It's a manual cherrypick of
https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.
Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 28c742573ccaeb55c16bc02fb25fdd86b8d1f76a |
|
04-Nov-2010 |
Jesse Wilson <jessewilson@google.com> |
Add @Deprecated to match @deprecated where it's missing.
Change-Id: Ice95022671968386a601f32df7850f9baa1d2dd0
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| b766ab830a714c0b79f64265e681f454865ffe65 |
|
02-Sep-2010 |
Jason Chen <jasonchen@google.com> |
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.
Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| fdbdeb3137a6b47527d1d714afbb7e1b19b474ec |
|
12-Aug-2010 |
Derek Sollenberger <djsollen@google.com> |
Fix invalid comment in WebSettings.
The get/set for the pluginPath is leftover from the Gear's plugin
and is no longer useful now that plugins are loaded from their
own APK using the package manager. These methods were modified to
be no-ops in froyo, but the documentation was never completed.
Change-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6
http://b/2811032
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68 |
|
25-Aug-2010 |
Adam Powell <adamp@google.com> |
New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.
Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f |
|
30-Mar-2010 |
Adam Powell <adamp@google.com> |
Remove overscrolling
Change-Id: I7e9db8d8a9b8ef67f0c0c82bf57c9155b7ebabea
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 300f2e95a4cecebb80c2c55418745df5c0c2fb6c |
|
22-Mar-2010 |
Patrick Scott <phanna@android.com> |
Add on-demand setting for plugins.
Deprecate the old apis for enabling plugins in favor of the multi-state plugin
flag. Add the assets for WebView to display the plugin placeholder for on-demand
plugins.
Bug: 2411524
Change-Id: I5a35cc6d0afced1489f54d4dcb8bb92d36de52d8
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| f4418b0113ff63c82348844f4c945c81aa9157ad |
|
19-Mar-2010 |
Grace Kloba <klobag@google.com> |
Change api for webview overscroll background.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 2d17e1d212ed88fdeca4b27bf04c17c56bd5dee1 |
|
09-Mar-2010 |
Grace Kloba <klobag@google.com> |
Add an api to set WebView over scroll background.
If the WebView doesn't support zoom, or WebView does
not use wide viewport and horizontal is just fit,
don't do over scroll.
Fix http://b/issue?id=2498403
Fix http://b/issue?id=2497901
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 18773afa64d407ebdd4bfc7bc151497d4447884d |
|
25-Feb-2010 |
Ben Murdoch <benm@google.com> |
Keep track of when the HTML5 database path has been set, so that we don't inadvertantly sync it to the native side before it
has been set by the client.
Change-Id: Idcf604060e5208ec28610dd13e9858adcf44165e
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| f43113f6216efacc3957fc48d9fa1c0326facceb |
|
18-Feb-2010 |
Patrick Scott <phanna@android.com> |
Unhide setBlockNetworkLoads.
Blocking network images is not as secure as completely blocking network loads.
Leave setBlockNetworkImage so clients can reduce bandwidth by disabling remote
images. This will allow file:// and content:// URIs to load.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 18e939623556928f73fcc7511c85a537929a4a7e |
|
11-Feb-2010 |
Dan Egnor <egnor@google.com> |
Eliminate dependencies on Checkin, replacing checkin events with EventLog
events (and in one case, a DropBox entry).
Add a simple intent that triggers master-clear (and toggle EFS), given the
right permissions.
Bug: 2264596
Bug: 2350452
Bug: 2264596
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 91f2a20a5957095a6cba9f97326ea0f1eab17195 |
|
09-Feb-2010 |
Bjorn Bringert <bringert@android.com> |
Add content provider for browser geolocation permissions
This replaces the old Google-specific geolocation setting.
Fixes http://b/issue?id=2428694
Part of http://b/issue?id=2383870
Change-Id: I6308b476ad18b1d71d7438b936c592a45365c9f0
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 3a0def280fa4f6306929910a414b41ae58a7d139 |
|
24-Jan-2010 |
Grace Kloba <klobag@google.com> |
Manual merge pinch zoom from Eclair to Master.
Too many conflicts which prevent me to use git cherry-pick.
Merge based on the source diff.
WebSettings.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commitdiff;h=5f01d7e268167c5cfb3366ce08e20a66d9b6fa6f
WebView.java (excl. drag tracker changes)
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebView.java;h=ab1841e140d72c22885512722cf1b75925bb8747;hp=ed1a98ae2d9321a483f6f8fa97b29b78121e94a7;hb=eclair;hpb=db08d5cd441424e4f9621aae7c2414934f781400
WebViewCore.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebViewCore.java;h=8ac915c556e3461f3c572c3a68d191ca1fecfee7;hp=a5a48527a389609e40da14ecad8c12dd8377cfaf;hb=eclair;hpb=dafc19a1406bdd554fb4629d79c8aa4d75aca363
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 097b1e777a2a29eef3938338cb0c355203bf1448 |
|
24-Nov-2009 |
Grace Kloba <klobag@google.com> |
Add PageCacheCapacity to the WebSettings.
By default, page cache is disabled.
http://b/issue?id=2284168
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| d9e22ed8fe08c8c9fcf5c47a6b25d335a3158056 |
|
07-Nov-2009 |
Grace Kloba <klobag@google.com> |
am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-mr2
* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
Remove "@hide pending API council" in webkit to expose
|
| 0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65 |
|
22-Oct-2009 |
Grace Kloba <klobag@google.com> |
Remove "@hide pending API council" in webkit to expose
the apis to SDK.
Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.
Remove @hide for freeMemory() in WebView.
Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 8f5e405f60e3816f61549783782d9bf0d9d4d199 |
|
06-Oct-2009 |
Grace Kloba <klobag@google.com> |
mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2 |
|
30-Sep-2009 |
Mike LeBeau <mlebeau@android.com> |
Unhide APIs for enabling geolocation in web views. I've confirmed
with Grace that these are okay to unhide.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| dee76be487fcdc975877f85221a693b87b9669a7 |
|
22-Sep-2009 |
Andrei Popescu <andreip@google.com> |
Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 24a3ff958b87550904a71961835f6883d1411c27 |
|
22-Sep-2009 |
Grace Kloba <klobag@google.com> |
Change double tap toast to long toast.
Change toast count to static to cross all the windows.
It should be --count instead of count--.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| f8d8b46a2c684d51cd661a9d479dd895420a90b2 |
|
21-Sep-2009 |
Grace Kloba <klobag@google.com> |
Add a tip toast for double tap.
Fix http://b/issue?id=2059934
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| f8d4964e45f7e671f4b333386b4269b23ced4750 |
|
08-Sep-2009 |
Cary Clark <cary@android.com> |
default overview mode to false in webkit
Browser defaults overview mode to true in BrowserSettings.java,
but a WebView should default overview mode to false. This permits
applications without zoom interfaces, such as HTMLViewer, to
have the same interface as before.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| ce761d3219d1a091e6177ff852d9f0636777f04f |
|
28-Aug-2009 |
Grace Kloba <klobag@google.com> |
Only add model in the UA for the release build
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 09b0ca1ceefde02b9ed50dc4dd12774ba569143f |
|
26-Aug-2009 |
Steve Block <steveblock@google.com> |
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| d875ce6dac3c2e9a671c121c80b40d2536cbb2af |
|
24-Aug-2009 |
Steve Block <steveblock@google.com> |
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
This fixes bug http://b/issue?id=1933893
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 9d3273f62288fa54536a3928383588398ca2d029 |
|
21-Aug-2009 |
Steve Block <steveblock@google.com> |
Java-side changes to persist Geolocation permissions between browser sessions.
This fixes bug http://b/issue?id=2054365.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 06cd751b052e65c359b16cce0570b6fab305eb89 |
|
21-Aug-2009 |
Steve Block <steveblock@google.com> |
Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
This fixes bug http://b/issue?id=2067559.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| e397a88e4fd65ee7d346f63a43e6608dba943ee9 |
|
06-Aug-2009 |
Grace Kloba <klobag@google.com> |
Couple of tuning for the Browser zoom.
1. Added a setting to control whether a page is loaded with overview mode;
2. If there is no viewport metag tag, a page will be loaded in the viewport
at least 800px wide.
3. When we adjust zoom scale in the overview mode, don't use animation.
4. When zoom out to close to min zoom scale, switch to overview mode. So double
tap will always have visual feedback unless it is mobile site.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| c27a9acb3b7ec4d1845b623cc167e0b62b1d0585 |
|
03-Aug-2009 |
Andrei Popescu <andreip@google.com> |
Enable workers for v8
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 1c829208eadf175ad4600e70a14013b50a20adfe |
|
22-Jul-2009 |
Andrei Popescu <andreip@google.com> |
Enforce app cache maximum size
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 972acd0c339db4b6a72c307ae0a0b2b5405376db |
|
10-Jul-2009 |
Andrei Popescu <andreip@google.com> |
Undo the changes accidentally merged from Donut
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| ec696c0115bbc915417bd76af6432bc603b680d2 |
|
09-Jul-2009 |
Grace Kloba <klobag@google.com> |
Fix the build. Remove mPluginsPath as it is not used in the master any more.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| a5f451f3aec0946360b8bf116c0b83955f2e6d79 |
|
09-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 3bb69233: Merge change 6620 into donut
Merge commit '3bb692338fed7f34f010398fe8b831d0de22c6e8'
* commit '3bb692338fed7f34f010398fe8b831d0de22c6e8':
Keep Gears permissions in sync with system location settings.
|
| 215a23654ad6dfcc231793e5fab21e9f71ca374d |
|
08-Jul-2009 |
Andrei Popescu <andreip@google.com> |
Keep Gears permissions in sync with system location settings.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| b4f33445b8106f550ade837362c678cf9de2ecd2 |
|
26-Jun-2009 |
Grace Kloba <klobag@google.com> |
Update WebKit user agent.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| d1ebf538a9f475ef9ac34480ef7ce742454bc899 |
|
25-Jun-2009 |
Grace Kloba <klobag@google.com> |
resolved conflicts for merge of 0d8b77c2 to master
|
| 0d8b77c2453d0e597f94e39212e4bfeed8affffa |
|
25-Jun-2009 |
Grace Kloba <klobag@google.com> |
Add ZoomDensity so that we can change the desired default scale.
Fix a bug where we didn't adjust the viewport scale according to our density.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 274680d9b8fce08f31c23dda796ecec937c942de |
|
28-May-2009 |
Ben Murdoch <benm@google.com> |
Add support for toggling DOM Storage support on and off.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 2e5c150e746647a1ce5c10e1708debbf06c45ea7 |
|
03-Jun-2009 |
Derek Sollenberger <djsollen@google.com> |
Centralized debug flags and enabled more granular control of debug settings.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| cc77c6bd6f2adf0ee26480deb1ff8923a7bfa891 |
|
25-May-2009 |
Romain Guy <romainguy@android.com> |
am ff686ce1: Change when gestures listeners are fired.
Merge commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2'
* commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2':
Change when gestures listeners are fired.
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
|
| c27d9b5341b29c1b58c882f0a04b4c519d8a9853 |
|
25-May-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 658ab7d787f64987d7c45aae08e5a12a073afe78 |
|
14-May-2009 |
Grace Kloba <klobag@google.com> |
Added PluginManager to handle getting all the plugin directories from PackageManager.
Deprecated the old api to set a single plugin path.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 11e8fe5a7208c9cd6afc2a0373761ae506d7707f |
|
11-May-2009 |
Nicolas Roard <nicolasroard@google.com> |
Add modifications to handle the WebStorage settings + the WebStorage bridge native functions
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 7df1985e86635af006be3dfa65987d60e290b5de |
|
22-Apr-2009 |
Ben Murdoch <benm@google.com> |
Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the browser.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 74008f608af0c567456d37e63d48643689388c74 |
|
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
| 60a9a7d05577a65c8904fcb5f32b6a7a10886a13 |
|
17-Apr-2009 |
Andrei Popescu <andreip@google.com> |
Enable Application Caches.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 42bc2ff5d2e3a10ab6c1fb1e716a124f2b446dbc |
|
14-Apr-2009 |
Dave Bort <dbort@android.com> |
Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=1780938
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| e1861133d51b9e6a6f658eb366630ad4f4d3ff8f |
|
27-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
|
| 105925376f8d0f6b318c9938c7b83ef7fef094da |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 2a73de7b21a89aa2ba4c254d28658b49793425b2 |
|
18-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
| c39a6e0c51e182338deb8b63d07933b585134929 |
|
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b |
|
20-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132569
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| adcd2ed8d24deddee528e96260d0ed673eeb261c |
|
21-Jan-2009 |
Mike Hearn <hearn@google.com> |
Add some documentation to WebView, WebSettings and CookieSyncManager.
Double-tree rendering is deprecated.
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/java/android/webkit/WebSettings.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/java/android/webkit/WebSettings.java
|