Dianne Hackborn d0b15cecc6 resolved conflicts for merge of f3307ae8 to master ...

Change-Id: Ic59db363391f73343eba32894113914ceea5a963

2010-06-04 14:09:02 -07:00

..

pm

resolved conflicts for merge of f3307ae8 to master

2010-06-04 14:09:02 -07:00

res

New xlarge screen size.

2010-04-28 16:51:52 -07:00

AbstractThreadedSyncAdapter.java

some changes due to an API review

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

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

Another try at fixing the docs build.

2010-05-18 11:11:57 -05:00

BroadcastReceiver.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

…

ContentProviderClient.java

…

ContentProviderNative.java

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

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

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

bug:2622719 move 'forcing of cursor execution' to ContentProvider

2010-04-28 15:32:54 -07:00

ContentService.java

merge from open-source master

2010-05-19 09:36:55 -07:00

ContentUris.java

…

ContentValues.java

Small speedup in getAsString and comment fix

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

Context.java

fix docs errors

2010-06-03 14:44:39 -07:00

ContextWrapper.java

new API in Context. on openDatabase, new param DatabaseErrorHandler

2010-06-03 12:38:11 -07:00

CursorEntityIterator.java

some changes due to an API review

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

CursorLoader.java

Add the Loader and supporting classes.

2010-05-18 00:07:15 -05:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

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

…

IContentService.aidl

some changes due to an API review

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

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Bug 2680071: Rename the Cloud to Device

2010-05-12 16:16:34 -07:00

IntentFilter.aidl

…

IntentFilter.java

…

IntentSender.aidl

…

IntentSender.java

Add support for heavy-weight applications.

2010-06-04 10:09:13 -07:00

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Add the Loader and supporting classes.

2010-05-18 00:07:15 -05:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

Added MultiSelectListPreference

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

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

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

am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo

2010-04-28 14:25:19 -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

…

SyncResult.java

Add JavaDoc for SyncResult

2010-04-27 11:21:53 -07:00

SyncStats.aidl

…

SyncStats.java

Add JavaDoc for SyncResult

2010-04-27 11:21:53 -07:00

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

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

…