Dianne Hackborn 02f5228c3c resolved conflicts for merge of f0d83fd9 to master

2009-07-28 15:23:21 -07:00

..

Activity.java

Add reporting of activity movement for search manager.

2009-07-14 11:37:11 -07:00

ActivityGroup.java

…

ActivityManager.java

…

ActivityManagerNative.java

Fix resource code and version attributes

2009-07-28 10:21:38 -07:00

ActivityThread.java

Fix issue #1991230: DisplayMetrics.displayHeight is not updated with orientation change

2009-07-27 20:48:50 -07:00

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

Application.java

…

ApplicationContext.java

am 11ea3347: Allow for screen density drawables in compatibility mode.

2009-07-24 16:08:56 -07:00

ApplicationErrorReport.java

Add exception line number to ApplicationErrorReport

2009-06-24 16:12:42 +02:00

ApplicationLoaders.java

…

ApplicationThreadNative.java

BackupAgent-related lifecycle APIs need to be oneway

2009-07-23 14:40:13 -07:00

BackupAgent.java

Make the BackupHelperDispatcher properly handle multiple helpers.

2009-06-25 20:36:09 -04:00

DatePickerDialog.java

Start using CLDR for some date-and-time strings and formats.

2009-05-15 10:15:50 -07:00

Dialog.java

Don't start search from a dialog if there is no activity associated with

2009-07-21 16:21:32 -07:00

ExpandableListActivity.java

…

FullBackupAgent.java

Pass the originating app's versionCode along with a restore set

2009-06-22 16:44:51 -07:00

IActivityController.aidl

Add reporting of activity movement for search manager.

2009-07-14 11:37:11 -07:00

IActivityManager.java

Fix resource code and version attributes

2009-07-28 10:21:38 -07:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

Add reporting of activity movement for search manager.

2009-07-14 11:37:11 -07:00

IAlarmManager.aidl

…

IApplicationThread.java

Add reporting of activity movement for search manager.

2009-07-14 11:37:11 -07:00

IBackupAgent.aidl

Pass the originating app's versionCode along with a restore set

2009-06-22 16:44:51 -07:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

Fix issue #1753079: running instrumentation in shared processes.

2009-06-19 11:37:35 -07:00

IntentService.java

…

ISearchManager.aidl

Fix back key handling for search dialog.

2009-07-20 14:08:24 -07:00

ISearchManagerCallback.aidl

Run search dialog in the system process.

2009-06-15 09:05:26 +01:00

IServiceConnection.aidl

…

IStatusBar.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IWallpaperService.aidl

…

IWallpaperServiceCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

Allow for screen density drawables in compatibility mode.

2009-07-24 10:47:15 -07:00

ListActivity.java

…

LocalActivityManager.java

…

Notification.aidl

…

Notification.java

Removed usage of tabs for indention

2009-07-07 12:45:46 -07:00

NotificationManager.java

…

package.html

…

PendingIntent.aidl

…

PendingIntent.java

Updates from API review.

2009-07-28 00:13:47 -07:00

ProgressDialog.java

…

ResultInfo.java

…

SearchDialog.java

Add menu with search settings to search dialog.

2009-07-28 20:15:49 +01:00

SearchManager.java

Remove search dialog PRE_CLOSE event

2009-07-27 11:48:32 +01:00

Service.java

…

StatusBarManager.java

…

SuggestionsAdapter.java

Remove search dialog PRE_CLOSE event

2009-07-27 11:48:32 +01:00

TabActivity.java

…

TimePickerDialog.java

…