Adam Powell b9eab6c793 resolved conflicts for merge of 81cd2e90 to master ...

Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71

2010-04-23 16:49:54 -07:00

..

pm

Logo attribute for manifest and PackageManager methods to fetch it

2010-04-23 15:49:07 -07:00

res

Fix issue #2519590: Lock screen stuck in landscape mode

2010-03-18 01:12:20 -07:00

AbstractThreadedSyncAdapter.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

ActivityNotFoundException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AsyncQueryHandler.java

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

BroadcastReceiver.java

eclair snapshot

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

ComponentCallbacks.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentName.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentName.java

Fix issue #2438980: Implement package watcher for voice recognizer service setting

2010-02-22 11:27:52 -08:00

ContentInsertHandler.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentProvider.java

Add "call" method on ContentProvider.

2010-03-05 12:08:39 -08:00

ContentProviderClient.java

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

ContentProviderNative.java

Speed up ContentProvider.query() in simple case by ~30%

2010-03-09 15:20:21 -08:00

ContentProviderOperation.java

Add error logging to ContentProviderOperation.

2010-02-19 15:30:44 -08:00

ContentProviderResult.java

eclair snapshot

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

ContentQueryMap.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentResolver.java

Missed these ones in the previous rename.

2010-04-08 14:08:54 -07:00

ContentService.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

ContentUris.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentValues.java

Small speedup in getAsString and comment fix

2010-03-23 11:20:45 -07:00

Context.java

resolved conflicts for merge of 4e33e9c1 to master

2010-04-08 13:54:58 -07:00

ContextWrapper.java

New external storage APIs.

2010-02-09 14:20:55 -08:00

CursorEntityIterator.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

DefaultDataHandler.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DialogInterface.java

Add Dialog.setOnShowListener() to the public API.

2010-01-15 11:35:06 -08:00

Entity.java

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

EntityIterator.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

EventLogTags.logtags

Rename logtag for clarity.

2010-04-08 13:25:46 -07:00

IContentProvider.java

Add "call" method on ContentProvider.

2010-03-05 12:08:39 -08:00

IContentService.aidl

some changes due to an API review

2010-03-30 17:31:52 -07:00

IIntentReceiver.aidl

eclair snapshot

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

IIntentSender.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

Intent.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Intent.java

Fix 2610961

2010-04-20 14:08:08 -07:00

IntentFilter.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IntentFilter.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

IntentSender.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

IntentSender.java

eclair snapshot

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

ISyncAdapter.aidl

eclair snapshot

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

ISyncContext.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ISyncStatusObserver.aidl

donut snapshot

2009-05-20 11:28:04 -07:00

MutableContextWrapper.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

OperationApplicationException.java

eclair snapshot

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

package.html

Deprecate fill_parent and introduce match_parent.

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

PeriodicSync.aidl

add sync polling

2010-02-05 15:16:20 -08:00

PeriodicSync.java

add sync polling

2010-02-05 15:16:20 -08:00

ReceiverCallNotAllowedException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SearchRecentSuggestionsProvider.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ServiceConnection.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SharedPreferences.java

Added MultiSelectListPreference

2010-04-15 10:18:17 -07:00

SyncAdaptersCache.java

Fix some bugs.

2010-03-04 11:52:14 -08:00

SyncAdapterType.aidl

eclair snapshot

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

SyncAdapterType.java

eclair snapshot

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

SyncContext.java

eclair snapshot

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

SyncInfo.aidl

some changes due to an API review

2010-03-30 17:31:52 -07:00

SyncInfo.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

SyncManager.java

create a SyncManager WakeLock for each syncadapter

2010-04-07 14:24:58 -07:00

SyncOperation.java

- changed periodic sync scheduling to just creating pending

2010-03-30 18:31:27 -07:00

SyncQueue.java

- changed periodic sync scheduling to just creating pending

2010-03-30 18:31:27 -07:00

SyncResult.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SyncResult.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

SyncStats.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SyncStats.java

eclair snapshot

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

SyncStatusInfo.aidl

donut snapshot

2009-05-20 11:28:04 -07:00

SyncStatusInfo.java

add sync polling

2010-02-05 15:16:20 -08:00

SyncStatusObserver.java

eclair snapshot

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

SyncStorageEngine.java

am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo

2010-04-07 11:58:21 -07:00

UriMatcher.java

donut snapshot

2009-05-20 11:28:04 -07:00