Romain Guy 87ef4252ec resolved conflicts for merge of 176a88ff to master

2010-01-27 16:20:49 -08:00

..

accessibilityservice

eclair snapshot

2009-11-13 13:53:39 -08:00

accounts

enhance the sync manager backoff logic and add support for retry-after

2010-01-25 16:41:58 -08:00

annotation

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

More work on device admins:

2010-01-27 13:51:53 -08:00

appwidget

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

backup

Move towards a formal public API for backup and restore

2010-01-25 19:41:23 -08:00

bluetooth

am f5d2eec4: am 11b97c50: Merge change I551ed729 into eclair

2009-12-21 14:22:47 -08:00

content

More device admin work: description, policy control.

2010-01-26 12:28:15 -08:00

database

caching PRAGMA sql statements caused cts-tests failures.

2010-01-20 16:39:40 -08:00

ddm

Move VM feature strings (used by DDMS) into VM.

2010-01-22 09:36:03 -08:00

debug

…

emoji

…

gesture

Added comments for GestureUtilities.

2010-01-25 17:59:15 -08:00

hardware

Add support for setting camera display orientation.

2010-01-26 11:07:07 -08:00

inputmethodservice

am ace8addc: am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.

2010-01-13 06:15:38 -08:00

net

NetworkManagementService: Introduce INetworkManagementEventObserver

2010-01-22 16:10:29 -08:00

os

More work on device admins:

2010-01-27 13:51:53 -08:00

pim

Make vCard importer support lower case params.

2010-01-18 08:30:39 +09:00

preference

Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions

2010-01-25 13:45:52 -08:00

provider

Merge "Add request header support for the Browser/WebView. QSB can use this instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden."

2010-01-27 13:41:39 -08:00

security

…

server

Move Search dialog out of system process into current activity.

2010-01-27 12:16:45 -08:00

service/wallpaper

First pass at new device policy and administration APIs.

2010-01-17 15:10:24 -08:00

speech

Adding Recognition Service and Listener wrappers

2010-01-26 11:23:52 +00:00

test

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

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

text

allow + in usernames

2010-01-14 14:57:20 -08:00

util

Bumper un-@hide (un-@pending actually) of previously reviewed APIs:

2010-01-07 19:10:43 -08:00

view

New View.dispatchDisplayHint() API.

2010-01-27 15:53:40 -08:00

webkit

Add request header support for the Browser/WebView.

2010-01-27 12:28:11 -08:00

widget

resolved conflicts for merge of 176a88ff to master

2010-01-27 16:20:49 -08:00

package.html

…