Cary Clark
72ab9980cb
account for find dialog height when positioning layers
...
The Find dialog draws on top of the WebView, including any
layers attached to the bottom of the screen. Adjust the view
dimenions returned to the layer code by the height of the Find
dialog if visible.
http://b/2453769
2010-03-02 10:59:44 -05:00
Mike Lockwood
04218254ec
Merge "Don't eat IllegalArgumentExceptions in LocationManagerService."
2010-03-02 07:38:40 -08:00
Andy McFadden
7d7ce2bbdd
Merge "Tone down a log message."
2010-03-02 07:36:23 -08:00
Mike Lockwood
3b9ef08bbb
Don't eat IllegalArgumentExceptions in LocationManagerService.
...
The exeptions should be returned to the Binder client instead.
Change-Id: I8ab36880622bf8b4fdf28407dec50652c48b6712
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-02 10:33:55 -05:00
Derek Sollenberger
2fb941100f
am 717c6ae0: (-s ours) am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
...
Merge commit '717c6ae0cf1f82168b18ba2ba248313bcad7ae3e'
* commit '717c6ae0cf1f82168b18ba2ba248313bcad7ae3e':
DO NOT MERGE. force plugins to render on top of browser content.
2010-03-02 07:00:21 -08:00
Derek Sollenberger
717c6ae0cf
am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
...
Merge commit '2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp
* commit '2705c8f09975f1bf10c84af323a67c104a177129':
DO NOT MERGE. force plugins to render on top of browser content.
2010-03-02 06:44:47 -08:00
Leon Clarke
cb01dba348
Fix issue with authentication with flash
2010-03-02 14:43:03 +00:00
Derek Sollenberger
2705c8f099
Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
2010-03-02 06:33:32 -08:00
Patrick Scott
0245e09fa7
Merge "Store the LoadListener in the SslErrorHandler passed to the client."
2010-03-02 05:40:09 -08:00
Mike Lockwood
debecf2e40
Merge "Don't poke user activity when unplugging unless screen is already on."
2010-03-02 04:29:04 -08:00
Grace Kloba
5f38e1aaa1
Start the synchronous load in the WebCore thread.
...
Fix http://b/issue?id=2480606
2010-03-01 23:10:10 -08:00
Ken Shirriff
0ef3eeec40
Merge "Remove DateException and obsolete DateUtils functions."
2010-03-01 22:46:07 -08:00
Romain Guy
34db992802
Merge "Cleaning in ListWithEditTextHeaderTest."
2010-03-01 21:56:22 -08:00
Dianne Hackborn
829778843c
Move the pointer location thing out of common.
2010-03-01 21:42:15 -08:00
Dianne Hackborn
ef05e076ce
Fix issue #2448075 : aapt doesn't fix up activity-alias android:targetActivity links
...
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
2010-03-01 20:42:14 -08:00
Charles Chen
883dbacb12
Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings."
2010-03-01 19:05:20 -08:00
Charles Chen
6a8b73be57
Fixing a bug with TTS that caused TTS to ignore the default settings
...
unless the user had set the defaults to always override app settings.
2010-03-01 18:52:41 -08:00
Mathias Agopian
31901cc0b6
fix [2425395] portrait UI briefly shows in landscape
...
the "freeze" timeout was not initialized properly which caused it
to kick-in immediately instead of after 5s
2010-03-01 18:36:14 -08:00
Mathias Agopian
5d26c1e38d
Added a name to Surface created by SurfaceFlinger
...
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
2010-03-01 18:34:50 -08:00
Mathias Agopian
69f22feb85
fix [2476230] sensor battery stats could get out of sync if an error occurs
...
Fixed a few problems with the SensorService:
- a race condition when talking to the BatteryStatService
- only report changes to BatteryStatService when there are no errors
(ie: when a change actually happens)
- tell the BatteryStatService when a sensor is deactivated because its
client died
- rewrite enableSensor() so it's readable
- implement dump() so dumpsys will display some infos about active sensors
- recompute the delay properly when sensors are added/removed
2010-03-01 18:31:16 -08:00
Mike Lockwood
84a8934673
Don't poke user activity when unplugging unless screen is already on.
...
Change-Id: I5a5f233541e13b3a916ad0d8b3bf8d6fb49ab7fd
BUG: 1317687
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-01 21:28:58 -05:00
Romain Guy
42c79880b0
Apply alpha animations on ImageView instances.
...
Bug #2479570
2010-03-01 17:21:59 -08:00
Daniel Sandler
7491d8757f
Merge "New vibrate/silent mode behavior."
2010-03-01 17:16:55 -08:00
Ken Shirriff
cfa8fd0799
Remove unused Calendar.insertVEvent method
2010-03-01 16:42:42 -08:00
Romain Guy
58c63990a2
Merge "Prevent crash in Dialog. Bug #2249637 "
2010-03-01 16:41:27 -08:00
Romain Guy
7883c975dd
Prevent crash in Dialog.
...
Bug #2249637
2010-03-01 16:39:17 -08:00
Ficus Kirkpatrick
922a12e14d
Merge "Demote the famous ResourceTypes warning to LOGV."
2010-03-01 16:36:26 -08:00
Ficus Kirkpatrick
56c0952a1f
Demote the famous ResourceTypes warning to LOGV.
...
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.
Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
2010-03-01 16:33:53 -08:00
Grace Kloba
d6dc43bf4f
am c0524d26: (-s ours) am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
...
Merge commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'
* commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
DO NOT MERGE
2010-03-01 16:27:44 -08:00
Marc Blank
918a95b9c9
Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"
2010-03-01 16:18:27 -08:00
Marc Blank
5b8c69d95a
Rename _SYNC_LOCAL_ID to _SYNC_DATA
...
* This is being used as a discretionary column by Exchange calendar
sync, so rename to avoid association with old usage
Change-Id: I544e285fa04d252c945c1953b57ef67da0e588ae
2010-03-01 16:17:50 -08:00
Grace Kloba
c0524d26a6
am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
...
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp
* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
DO NOT MERGE
2010-03-01 16:13:21 -08:00
Grace Kloba
3ff7cecd3d
Merge "DO NOT MERGE" into eclair-mr2
2010-03-01 16:02:12 -08:00
Gilles Debunne
3c5d27ab1b
Cleaning in ListWithEditTextHeaderTest.
...
Switched to ActivityInstrumentationTestCase2.
As far as http://b/issue?id=2446911 is concerned, I was unable
to reproduce a test fail. This was not the case a week ago.
A fix has probably been submitted in the meantime.
Change-Id: Id6e95218a2c9d29b0b4eb051a7a1288f9a9809fd
2010-03-01 16:01:52 -08:00
Vasu Nori
fb9f10f693
Merge "revert due to the sqlite build problem on Mac.."
2010-03-01 15:54:34 -08:00
Vasu Nori
b649ca250a
revert due to the sqlite build problem on Mac..
2010-03-01 15:53:05 -08:00
Jason Sams
108831a72c
Merge "Add support for linking to a skia bitmap rather than always copying the data from the bitmap."
2010-03-01 15:42:47 -08:00
Jason Sams
1549257d12
Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain."
2010-03-01 15:42:03 -08:00
Jason Sams
053100e6b6
Merge "Begin implementation of generated java files from RS files."
2010-03-01 15:40:37 -08:00
Wu-cheng Li
8cbb8f5e1f
Unhide zoom API.
...
bug:2458926
2010-03-01 15:32:33 -08:00
Jason Sams
8a64743f37
Add support for linking to a skia bitmap rather than always copying the data from the bitmap.
2010-03-01 15:31:04 -08:00
Andreas Huber
7714d7132e
Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly."
2010-03-01 15:07:34 -08:00
Kenny Root
ec8f9b6481
Fix misspelling in JavaDoc tag
...
Minor misspelling in "@inheritDoc" tag
Change-Id: I1e6252b549c20e1871e4be0170d2d06256beec9f
2010-03-01 15:01:51 -08:00
Andreas Huber
5f0d5ce38a
Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly.
2010-03-01 14:58:39 -08:00
Fred Quintana
aceb6fe23e
Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"
2010-03-01 14:47:22 -08:00
Fred Quintana
262226137d
fix a system crash that occurs when ChooseAccountActivity is
...
restarted from the icicle
http://b/issue?id=2352368
2010-03-01 14:39:00 -08:00
Romain Guy
61c9d4b450
Let apps change the bottom strip in TabWidget.
...
Bug #2478088
Also expose a few useful APIs.
2010-03-01 14:23:23 -08:00
Vasu Nori
e0dab5bf67
Merge "register a logging func with sqlite, to get extra info on errors"
2010-03-01 14:22:08 -08:00
Ken Shirriff
a53bbe4033
Remove DateException and obsolete DateUtils functions.
...
These functions are deprecated and no longer used.
2010-03-01 14:21:13 -08:00
Paul Westbrook
37acc3122c
Merge "Bug 2464063"
2010-03-01 14:21:03 -08:00