frameworks_base

pm

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

res

Fix typo in ColorStateList documentation.

2010-01-04 14:45:49 -08:00

AbstractThreadedSyncAdapter.java

moved the hidden sync helpers out of the framework

2009-12-14 16:33:13 -08:00

ActiveSyncInfo.aidl

donut snapshot

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

ActiveSyncInfo.java

eclair snapshot

2009-11-13 13:53:39 -08: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

donut snapshot

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

ContentInsertHandler.java

auto import from //depot/cupcake/@135843

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

ContentProvider.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

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

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

ContentProviderOperation.java

eclair snapshot

2009-11-13 13:53:39 -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

ContentResolver.query() includes performance considerations

2010-01-08 12:53:50 -08:00

ContentService.java

eclair snapshot

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

ContentUris.java

auto import from //depot/cupcake/@135843

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

ContentValues.java

auto import from //depot/cupcake/@135843

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

Context.java

Fix DropBox reference in SDK comment. (Fix SDK build.)

2010-01-04 11:02:00 -08:00

ContextWrapper.java

eclair snapshot

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

CursorEntityIterator.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

DefaultDataHandler.java

auto import from //depot/cupcake/@135843

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

DialogInterface.java

donut snapshot

2009-07-29 14:25:07 -07: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

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

EventLogTags.logtags

move event log tags used by SyncAdapter into a local .logtags file

2009-12-09 13:30:07 -08:00

IContentProvider.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

IContentService.aidl

eclair snapshot

2009-11-13 13:53:39 -08: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

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

IntentFilter.aidl

auto import from //depot/cupcake/@135843

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

IntentFilter.java

Update imports to android-common

2009-12-21 13:59:18 -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

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

auto import from //depot/cupcake/@135843

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

SyncAdaptersCache.java

eclair snapshot

2009-11-13 13:53:39 -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

SyncManager.java

change remaining frameworks/base Gservices to Secure settings

2010-01-07 15:00:37 -08:00

SyncResult.aidl

auto import from //depot/cupcake/@135843

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

SyncResult.java

eclair snapshot

2009-11-13 13:53:39 -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

eclair snapshot

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

SyncStatusObserver.java

eclair snapshot

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

SyncStorageEngine.java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

UriMatcher.java

donut snapshot

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