Dianne Hackborn
9b081a809a
resolved conflicts for merge of 8b625a95 to master
...
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
2010-05-18 18:21:07 -07:00
Dianne Hackborn
dc8a7f69d7
Add new API to take over a window's Surface.
...
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
2010-05-18 10:46:33 -07:00
The Android Open Source Project
f90fa1a04f
am 75c1b73d: am 40090708: am 4547e528: merge from open-source master
2010-05-18 09:28:28 -07:00
The Android Open Source Project
400907086a
am 4547e528: merge from open-source master
...
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken
* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
Removed Calls to deprecated APIs and unused Imports
2010-05-18 09:21:28 -07:00
The Android Open Source Project
4547e5284e
merge from open-source master
...
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
2010-05-18 09:18:37 -07:00
Jeff Hamilton
f6e9a082a2
Merge "Another try at fixing the docs build."
2010-05-18 09:14:36 -07:00
Scott Main
5ddfac4239
am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
2010-05-18 09:12:37 -07:00
Jeff Hamilton
7860b10d16
Another try at fixing the docs build.
...
Change-Id: Ief60f4e71efee1d3bb4ee36e2f2a2fcaeb996284
2010-05-18 11:11:57 -05:00
Scott Main
8473259ddb
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c
am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
2010-05-18 09:02:09 -07:00
Scott Main
e3b9f8b9b2
docs: fix markup error
...
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
2010-05-18 08:43:11 -07:00
Jeff Hamilton
e5c50c6211
Merge "Fix a broken docs link."
2010-05-18 08:35:36 -07:00
Jeff Hamilton
e6c6d09a7e
Fix a broken docs link.
...
Change-Id: I2e940165726ecfce306cd143ed049045c927b6a0
2010-05-18 10:34:47 -05:00
Steve Block
5de72739b7
Merge "Make sure Geolocation is robust to location providers being absent on the device."
2010-05-18 08:28:42 -07:00
Jeff Hamilton
e188664f8a
Merge "Add the Loader and supporting classes."
2010-05-18 07:24:50 -07:00
Steve Block
3d9e066ab3
Make sure Geolocation is robust to location providers being absent on the device.
...
Bug: 2692830
Change-Id: I19f88e20f00fe7ecfb77c06197213d273bd80411
2010-05-18 15:16:55 +01:00
Jeff Hamilton
9911b7f83d
Add the Loader and supporting classes.
...
Loaders are designed to make it easier to manage
asynchronously loading data.
Change-Id: I948db08c721411e94fca071dc6fb4db2b83ea4d6
2010-05-18 00:07:15 -05:00
Grace Kloba
5e02c431a3
If we can't scroll any more, stop the animation and
...
resume update. Otherwise, we can't touch select until
the scroller animation is done.
Fix http://b/issue?id=2666473
2010-05-17 20:38:21 -07:00
Grace Kloba
3c19d99042
If the new fling is much slower (less than 1/5 of
...
the previous fling), don't accelerate it.
Fix http://b/issue?id=2672074
2010-05-17 20:34:08 -07:00
Scott Main
b3976bb395
am 0583ac4c: am 9719fe11: am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
2010-05-17 18:07:55 -07:00
Scott Main
9719fe11a1
am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
...
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
2010-05-17 18:04:07 -07:00
Scott Main
fbb285e67f
am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
...
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
2010-05-17 18:01:28 -07:00
Scott Main
8b3cea01bf
docs: revise webview description and add info for targeting screen densities
...
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
2010-05-17 17:48:30 -07:00
Mike Lockwood
a42f4c249f
am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 15:08:48 -07:00
Mike Lockwood
c5859388bd
am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
...
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken
* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:59:39 -07:00
Jean-Baptiste Queru
7f6cf96cbf
am 5942ccf0: am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken
2010-05-17 14:58:44 -07:00
Mike Lockwood
3e9e9696f1
am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
...
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp
* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd
Resurrect flashlight support in obsolete IHardwareService Binder API.
...
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.
Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-17 17:47:20 -04:00
Jean-Baptiste Queru
9eb7a72253
resolved conflicts for merge of f7fb5331 to kraken
...
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
2010-05-17 13:50:32 -07:00
Grace Kloba
20ca117770
Update the mLatestProgress of CallbackProxy even
...
mWebChromeClient is null as WebView needs it.
Fix http://b/issue?id=2685989
2010-05-17 13:08:05 -07:00
Christian Mehlmauer
15d24708b1
Removed Calls to deprecated APIs and unused Imports
...
Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
2010-05-17 21:27:27 +02:00
Derek Sollenberger
90b6e48793
Refactor the on-screen zoom controls into a separate class.
...
This CL is the first in a series of CL's that will extract the
zoom code from WebView and put it into ZoomManager. This initial
CL only extracts the on-screen zoom controls and required variables
into the ZoomManager. Since the on-screen controls are well defined
I put them into their own class called ZoomControls.
All of WebView's zoom interactions are handled by the ZoomManager.
The ZoomManager can then handle the request internally or as in the
case of on-screen controls pass the request to another class.
Change-Id: Icfc91ed0456c88d633249c26b9afc7dd216f75a1
http://b/2671604
2010-05-17 13:49:40 -04:00
Wu-cheng Li
c3848824f8
am a3b5ff07: am e339c5ed: Add camera focus distances API.
2010-05-17 09:21:03 -07:00
The Android Open Source Project
f7fb5331e5
merge from open-source master
...
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301
Merge "Fixing indeterminate progress bar animation state."
2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf
Fixing indeterminate progress bar animation state.
...
When showing a progress bar instance more than once
it will not animate after the first time.
Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com >
2010-05-15 16:10:18 -03:00
Svetoslav Ganov
da35551845
Adding accessibility content provider responsible for user script injection. Adding support for injecting accessibility in WebViews with disabled JavaScript.
...
Change-Id: I1576238a0f855bb54e25d19404b8404d7d0f6037
2010-05-15 12:10:13 -07:00
Wu-cheng Li
e339c5edbe
Add camera focus distances API.
...
Applications can use this API to estimate the distance
between the subject and the camera.
bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
2010-05-15 12:40:54 +08:00
Scott Main
060341fa2d
am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
2010-05-14 11:59:04 -07:00
Scott Main
6c034325a8
am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
...
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
docs: add dev guide for backup
2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b
am b83a283a: docs: add dev guide for backup
...
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1
docs: add dev guide for backup
...
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
Dianne Hackborn
0efa0c45a1
Merge "More fragment stuff:"
2010-05-14 11:26:40 -07:00
Dianne Hackborn
6e8304e57e
More fragment stuff:
...
- New startActivityForResult() API.
- Fragments now should have the correct lifecycle while hanging around
in the back stack (not being destroyed and re-created).
- Rework of state save/restore to make it simpler and better. In theory
now any fragment (including layout and others in the hierarchy) can
now be retained across config changes, though this hasn't been tested.
Change-Id: I2a7fe560e14e567f5675a2f172a23fca67b3e97f
2010-05-14 11:22:48 -07:00
Adam Powell
a1700783b5
ActionBar - custom navigation views
...
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
2010-05-14 10:35:21 -07:00
Jeff Hamilton
7cd51efcbd
Remove the deprecated cursor methods.
...
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
2010-05-13 23:44:09 -05:00
Andrew Sapperstein
8d9db8e4c7
Added getNumColumns function to GridView.java.
...
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
2010-05-13 17:45:50 -07:00
The Android Open Source Project
a4bb641040
am 1331ded8: am e28776bb: am b1110149: merge from open-source master
2010-05-13 14:59:22 -07:00
The Android Open Source Project
e28776bbd7
am b1110149: merge from open-source master
...
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc
merge from open-source master
...
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00