Jean-Baptiste Queru 80ffd8c5ae resolved conflicts for merge of da9691e9 to master

2009-12-10 15:46:33 -08:00

..

accessibilityservice

…

accounts

am 74f7b139: am f307ec5d: Merge change Iafa92b8f into eclair-mr2

2009-12-02 20:33:59 -08:00

annotation

…

app

am c0c7b32e: am 45e77ce3: Merge change I154386b1 into eclair-mr2

2009-12-10 14:39:57 -08:00

appwidget

Prevent crash in Home when using widgets whose ids collide with Home's

2009-11-05 15:40:35 -08:00

backup

…

bluetooth

am ae88e2d1: Merge change I38227501 into eclair

2009-12-07 15:53:02 -08:00

content

am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java

2009-12-10 14:42:07 -08:00

database

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Document that some parameters will not be null and fix getSupportedPictureFormats.

2009-12-08 09:41:08 +08:00

inputmethodservice

Close popup when Keyboard gets a CANCEL motion event.

2009-12-08 14:18:19 -08:00

net

am 0e933c85: am f7d0b013: Add TrafficStats class to SDK.

2009-12-10 07:04:31 -08:00

os

Merge change If3bafe4f

2009-12-10 14:51:23 -08:00

pim

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

preference

…

provider

cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2

2009-12-10 11:36:44 -08:00

security

…

server

am ae88e2d1: Merge change I38227501 into eclair

2009-12-07 15:53:02 -08:00

service/wallpaper

Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

2009-11-20 16:27:27 -08:00

speech

Adding the ability to specify the speech synthesis

2009-11-19 12:02:55 -08:00

test

Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests

2009-12-10 14:49:14 -08:00

text

am 7c427030: Merge change I9088d29b into eclair-mr2

2009-12-07 07:17:26 -08:00

util

doc change: misc doc fixes.

2009-10-30 19:44:22 -07:00

view

Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests

2009-12-10 14:49:14 -08:00

webkit

Merge change Id469ba88 into eclair-mr2

2009-12-09 11:30:00 -08:00

widget

Merge change I98819b18 into eclair-mr2

2009-12-09 23:32:58 -08:00

package.html

…