Dianne Hackborn e3f054411b resolved conflicts for merge of 2af632f8 to master

2009-07-09 12:15:46 -07:00

..

pm

resolved conflicts for merge of 2af632f8 to master

2009-07-09 12:15:46 -07:00

res

am 1ecf5d28: Re-implementation of large screen support using window manager. * added background filler surface to fill the outer rim. Using the same layer as dim surface because they never co-exists (in the same window) * clean up the obsolete code in Compatibilt

2009-07-08 15:59:16 -07:00

AbstractCursorEntityIterator.java

…

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

…

ActiveSyncInfo.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

BroadcastReceiver.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

resolved conflicts for merge of 2af632f8 to master

2009-07-09 12:15:46 -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

…

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

…

ContentValues.java

…

Context.java

am 870e09fc: Fixes #1963229. Introduces Context#isRestricted().

2009-07-06 17:10:41 -07:00

ContextWrapper.java

Fixes #1963229. Introduces Context#isRestricted().

2009-07-06 16:45:17 -07:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.aidl

…

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

…

Intent.java

am d7cd29da: Add facility to run setup wizard after an update.

2009-07-03 08:58:10 -07:00

IntentFilter.aidl

…

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

…

ISyncStatusObserver.aidl

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncableContentProvider.java

…

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

…

SyncManager.java

- clean up the sync settings names to:

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

SyncResult.aidl

…

SyncResult.java

…

SyncStateContentProviderHelper.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

- clean up the sync settings names to:

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

SyncStorageEngine.java

resolved conflicts for merge of b7195159 to master

2009-07-06 17:44:41 -07:00

SyncUIContext.java

…

TempProviderSyncAdapter.java

- clean up the sync settings names to:

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

TempProviderSyncResult.java

…

UriMatcher.java

…