Nick Pelly 038cabe024 NFC integration ...

Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>

2010-09-28 22:36:27 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 18:55:05 -07:00

annotation

Add Annotation for optional features.

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

app

NFC integration

2010-09-28 22:36:27 -07:00

appwidget

Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout

2010-06-23 17:44:30 -07:00

bluetooth

Fix Bluetooth Javadoc to clarify the maximum device name length.

2010-09-16 18:21:07 -07:00

content

NFC integration

2010-09-28 22:36:27 -07:00

database

DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'

2010-09-21 12:07:24 -07:00

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

2010-09-21 08:46:32 -07:00

inputmethodservice

Initialize Keyboard.Key attributes from parent Keyboard.Row

2010-09-17 15:40:35 +09:00

net

Move DownloadManager to android.app (DO NOT MERGE)

2010-09-27 17:12:47 -07:00

os

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

pim

Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread

2010-09-27 02:16:01 -07:00

preference

More SharedPreferences commit() -> apply() changes.

2010-09-03 11:18:28 -07:00

provider

NFC integration

2010-09-28 22:36:27 -07:00

security

…

server

Fix interaction between BluetoothEventLoop and BluetoothService.

2010-09-13 21:58:10 -07:00

service

Force wallpaper surface to 565.

2010-09-08 16:32:27 -07:00

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

Add suuport for splitting touch events across windows.

2010-09-26 22:20:12 -07:00

util

Fix problem where Base64InputStream single-byte reads were unsigned.

2010-09-22 10:28:27 -07:00

view

Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 12:33:14 -07:00

webkit

Allow touch events when clickable *or* longClickable

2010-09-27 15:51:09 -07:00

widget

Add suuport for splitting touch events across windows.

2010-09-26 22:20:12 -07:00

package.html

…