Eric Fischer d2146d4a7c resolved conflicts w/ 5bd644caf7 merge....

2009-05-15 11:38:38 -07:00

..

Activity.java

Accessibility feature - framework changes (replacing 698, 699, 700, 701 and merging with the latest Donut)

2009-05-14 23:47:05 -07:00

ActivityGroup.java

auto import from //depot/cupcake/@135843

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

ActivityManager.java

auto import from //depot/cupcake/@135843

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

ActivityManagerNative.java

Improve shutdown process to send broadcast for applications.

2009-05-08 12:59:21 -07:00

ActivityThread.java

removing log message checked in by acccident.

2009-05-12 00:19:40 -07:00

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

AlertDialog.java

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

AliasActivity.java

auto import from //depot/cupcake/@135843

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

Application.java

auto import from //depot/cupcake/@135843

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

ApplicationContext.java

am eae850ce: Allow intent resolution to be constrained by package name.

2009-05-15 07:06:46 -07:00

ApplicationLoaders.java

auto import from //depot/cupcake/@135843

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

ApplicationThreadNative.java

auto import from //depot/cupcake/@136745

2009-03-05 20:00:43 -08:00

DatePickerDialog.java

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

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

Dialog.java

Accessibility feature - framework changes (replacing 698, 699, 700, 701 and merging with the latest Donut)

2009-05-14 23:47:05 -07:00

ExpandableListActivity.java

auto import from //depot/cupcake/@135843

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

IActivityManager.java

Improve shutdown process to send broadcast for applications.

2009-05-08 12:59:21 -07:00

IActivityPendingResult.aidl

auto import from //depot/cupcake/@135843

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

IActivityWatcher.aidl

auto import from //depot/cupcake/@135843

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

IAlarmManager.aidl

auto import from //depot/cupcake/@135843

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

IApplicationThread.java

auto import from //depot/cupcake/@136745

2009-03-05 20:00:43 -08:00

IInstrumentationWatcher.aidl

auto import from //depot/cupcake/@135843

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

IIntentReceiver.aidl

auto import from //depot/cupcake/@135843

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

IIntentSender.aidl

auto import from //depot/cupcake/@135843

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

INotificationManager.aidl

auto import from //depot/cupcake/@135843

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

Instrumentation.java

auto import from //depot/cupcake/@135843

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

IntentService.java

auto import from //depot/cupcake/@135843

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

ISearchManager.aidl

Add 'includeInGlobalSearch' attribute to searchable meta-data.

2009-04-29 20:23:04 +01:00

IServiceConnection.aidl

auto import from //depot/cupcake/@135843

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

IStatusBar.aidl

auto import from //depot/cupcake/@135843

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

IThumbnailReceiver.aidl

auto import from //depot/cupcake/@135843

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

ITransientNotification.aidl

auto import from //depot/cupcake/@135843

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

IWallpaperService.aidl

auto import from //depot/cupcake/@135843

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

IWallpaperServiceCallback.aidl

auto import from //depot/cupcake/@135843

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

KeyguardManager.java

auto import from //depot/cupcake/@135843

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

LauncherActivity.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

ListActivity.java

auto import from //depot/cupcake/@135843

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

LocalActivityManager.java

auto import from //depot/cupcake/@135843

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

Notification.aidl

auto import from //depot/cupcake/@135843

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

Notification.java

AI 147803: add docs and images for docs on Toast and Notification docs

2009-04-26 15:50:49 -07:00

NotificationManager.java

auto import from //depot/cupcake/@135843

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

package.html

auto import from //depot/cupcake/@135843

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

PendingIntent.aidl

auto import from //depot/cupcake/@135843

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

PendingIntent.java

More optimization of dumpsys output.

2009-04-22 18:03:21 -07:00

ProgressDialog.java

AI 144210: am: CL 144182 am: CL 144181 Modify ProgressDialog class and its xml so that it follows the

2009-04-02 10:44:31 -07:00

ResultInfo.java

auto import from //depot/cupcake/@135843

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

SearchDialog.java

Fix a bug that findbugs found

2009-05-14 13:31:26 -07:00

SearchManager.java

Define mime type for shortcut validation path.

2009-05-08 14:54:08 -07:00

Service.java

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

StatusBarManager.java

auto import from //depot/cupcake/@135843

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

SuggestionsAdapter.java

Refactor SearchableInfo.

2009-05-06 13:54:42 +01:00

TabActivity.java

auto import from //depot/cupcake/@135843

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

TimePickerDialog.java

auto import from //depot/cupcake/@135843

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