Dianne Hackborn 8ec5b83fc8 Merge commit '1dac277f' into manualmerge ...

Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java

2009-07-01 21:19:35 -07:00

..

pm

am 72eb0aca: Merge change 5483 into donut

2009-06-29 16:37:17 -07:00

res

Expand support for different screen sizes.

2009-06-26 13:37:05 -07:00

AbstractCursorEntityIterator.java

content provider entities

2009-05-13 12:49:04 -07:00

AbstractSyncableContentProvider.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

AbstractTableMerger.java

Fix AbstractTableMerger for new Account format.

2009-06-15 15:41:04 -07:00

AbstractThreadedSyncAdapter.java

beef up the syncadapter API

2009-06-16 15:25:24 -07:00

ActiveSyncInfo.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

ActiveSyncInfo.java

merged 231cc608d0

2009-05-06 00:28:37 -07:00

ActivityNotFoundException.java

auto import from //depot/cupcake/@135843

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

AsyncQueryHandler.java

auto import from //depot/cupcake/@135843

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

BroadcastReceiver.java

AI 144405: am: CL 144307 am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.

2009-04-02 23:15:58 -07: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

Make android.content.ComponentName implement java.lang.Comparable.

2009-05-12 23:40:45 -04:00

ContentInsertHandler.java

auto import from //depot/cupcake/@135843

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

ContentProvider.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ContentProviderClient.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ContentProviderNative.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ContentProviderOperation.java

add a data_version column to the data table

2009-06-11 14:59:43 -07:00

ContentProviderResult.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ContentQueryMap.java

auto import from //depot/cupcake/@135843

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

ContentResolver.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

ContentService.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07: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

am 63e7155c: Merge change 4696 into donut

2009-06-18 19:35:32 -07:00

ContextWrapper.java

Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.

2009-06-18 17:10:57 -07:00

DefaultDataHandler.java

auto import from //depot/cupcake/@135843

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

DialogInterface.java

auto import from //depot/cupcake/@135843

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

Entity.aidl

content provider entities

2009-05-13 12:49:04 -07:00

Entity.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

EntityIterator.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

IContentProvider.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

IContentService.aidl

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

IEntityIterator.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

IIntentReceiver.aidl

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

IIntentSender.aidl

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

Intent.aidl

auto import from //depot/cupcake/@135843

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

Intent.java

Merge commit '1dac277f' into manualmerge

2009-07-01 21:19:35 -07:00

IntentFilter.aidl

auto import from //depot/cupcake/@135843

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

IntentFilter.java

Fix IntentFilter constructor to properly process the action parameter.

2009-06-11 18:50:40 -07:00

IntentSender.aidl

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

IntentSender.java

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

ISyncAdapter.aidl

beef up the syncadapter API

2009-06-16 15:25:24 -07:00

ISyncContext.aidl

auto import from //depot/cupcake/@135843

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

ISyncStatusObserver.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

MutableContextWrapper.java

auto import from //depot/cupcake/@135843

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

OperationApplicationException.java

enhance ContentProvider with the ability to perform batch operations

2009-05-15 13:55:32 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -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

SyncableContentProvider.java

decouple SyncAdapter from ContentProvider

2009-04-30 17:28:09 -07:00

SyncAdapter.java

beef up the syncadapter API

2009-06-16 15:25:24 -07:00

SyncAdaptersCache.java

add icon and label to the authenticator description

2009-06-15 15:57:30 -07:00

SyncAdapterType.aidl

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncAdapterType.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncContext.java

auto import from //depot/cupcake/@135843

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

SyncManager.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncResult.aidl

auto import from //depot/cupcake/@135843

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

SyncResult.java

auto import from //depot/cupcake/@135843

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

SyncStateContentProviderHelper.java

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

SyncStats.aidl

auto import from //depot/cupcake/@135843

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

SyncStats.java

auto import from //depot/cupcake/@135843

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

SyncStatusInfo.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

SyncStatusInfo.java

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

SyncStatusObserver.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncStorageEngine.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncUIContext.java

auto import from //depot/cupcake/@135843

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

TempProviderSyncAdapter.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

TempProviderSyncResult.java

auto import from //depot/cupcake/@135843

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

UriMatcher.java

AI 144034: am: CL 144032 Added missing import to fix breakage caused by CL 144008.

2009-04-02 09:16:44 -07:00