Jeff Sharkey 8059bcbfa7 resolved conflicts for merge of 1162fd77 to eclair-mr2

2009-11-16 14:49:07 -08:00

..

AbsListView.java

am 9d790678: Merge change I32ce8591 into eclair

2009-11-06 18:35:40 -08:00

AbsoluteLayout.java

auto import from //depot/cupcake/@135843

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

AbsSeekBar.java

Fix http://b/issue?id=2098873 (drawing glitch in SeekBar).

2009-09-14 13:05:43 -04:00

AbsSpinner.java

auto import from //depot/cupcake/@135843

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

Adapter.java

auto import from //depot/cupcake/@135843

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

AdapterView.java

resolved conflicts w/ 75986cf9bc merge....

2009-05-15 00:44:45 -07:00

AlphabetIndexer.java

Adding new query: aggregation suggestions

2009-06-10 16:40:37 -07:00

AnalogClock.java

auto import from //depot/cupcake/@135843

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

AppSecurityPermissions.java

Make sdk version and code names static finals in PackageParser.

2009-10-06 10:29:06 -07:00

ArrayAdapter.java

Fix ArrayAdapter, which was fixed in cupcake_dcm and kept fixed until donut, but is broken in eclair.

2009-07-09 14:29:15 +09:00

AutoCompleteTextView.java

Modify text validation behavior.

2009-11-12 10:31:07 -08:00

BaseAdapter.java

auto import from //depot/cupcake/@135843

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

BaseExpandableListAdapter.java

auto import from //depot/cupcake/@135843

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

Button.java

auto import from //depot/cupcake/@135843

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

Checkable.java

auto import from //depot/cupcake/@135843

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

CheckBox.java

auto import from //depot/cupcake/@135843

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

CheckedTextView.java

Do not show radio/checkboxes for <optgroup> labels.

2009-10-21 10:01:49 -04:00

Chronometer.java

AI 146012: am: CL 145860 am: CL 145568 Hide setStarted() from public API.

2009-04-13 16:57:28 -07:00

CompoundButton.java

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

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

CursorAdapter.java

AI 145994: Integrate #145778 from Donut.

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

CursorFilter.java

auto import from //depot/cupcake/@135843

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

CursorTreeAdapter.java

auto import from //depot/cupcake/@135843

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

DatePicker.java

Make the DatePicker respect the date format setting if the date is numeric.

2009-07-23 18:48:44 -07:00

DialerFilter.java

auto import from //depot/cupcake/@135843

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

DigitalClock.java

auto import from //depot/cupcake/@135843

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

DoubleDigitManager.java

auto import from //depot/cupcake/@135843

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

EditText.java

auto import from //depot/cupcake/@135843

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

ExpandableListAdapter.java

auto import from //depot/cupcake/@135843

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

ExpandableListConnector.java

auto import from //depot/cupcake/@135843

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

ExpandableListPosition.java

auto import from //depot/cupcake/@135843

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

ExpandableListView.java

Fix ExpandableListView context menus when has header views.

2009-08-17 09:53:17 -07:00

FastScroller.java

Fix fastscroll overlay size on WVGA by using dip.

2009-08-20 16:15:46 -07:00

Filter.java

Add ability to delay messages in Filter based on constraint. Use this to delay 500ms for delete keys in the search dialog.

2009-07-16 14:14:08 -07:00

Filterable.java

auto import from //depot/cupcake/@135843

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

FilterQueryProvider.java

auto import from //depot/cupcake/@135843

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

FrameLayout.java

Cleanup Gestures API and make it easier to use in 3rd party apps. Also fix the events processing in the gestures overlay mechanism. Give better control of the various properties of the overlay through XML attributes.

2009-05-24 23:45:03 -07:00

Gallery.java

Fix a possible NPE in View.

2009-09-14 15:15:30 -07:00

GridView.java

Prevent NPE when doing a fillSpecific layout.

2009-09-29 15:17:47 -07:00

HeaderViewListAdapter.java

auto import from //depot/cupcake/@135843

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

HorizontalScrollView.java

Fading scrollbars return. But you have to opt in.

2009-09-28 10:47:04 -07:00

ImageButton.java

Revise the ImageButton class description to include information

2009-05-18 16:05:52 -07:00

ImageSwitcher.java

auto import from //depot/cupcake/@135843

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

ImageView.java

Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.

2009-07-30 15:39:37 +08:00

LinearLayout.java

Default mBaselineAlignedChildIndex to -1 so it will still be valid when a LinearLayout is created programatically.

2009-08-12 17:18:33 -07:00

ListAdapter.java

auto import from //depot/cupcake/@135843

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

ListView.java

Fix possible NPE in AbsListView.positionSelector().

2009-09-28 13:45:00 -07:00

MediaController.java

When bringing up the media controller view, focus the play/pause button.

2009-08-19 17:05:48 -07:00

MultiAutoCompleteTextView.java

Manual merge from cupcake_dcm. Need to be reviewed by enf.

2009-05-25 17:37:41 +09:00

package.html

auto import from //depot/cupcake/@135843

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

PopupWindow.java

Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.

2009-11-11 18:51:18 -08:00

ProgressBar.java

Fix issue 2077333: The volume key will effect both ring and media vol at the same time.

2009-09-01 10:35:15 -07:00

QuickContactBadge.java

QuickContactBadge: Make lookup key query asynchronous.

2009-10-08 11:06:39 -07:00

RadioButton.java

auto import from //depot/cupcake/@135843

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

RadioGroup.java

auto import from //depot/cupcake/@135843

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

RatingBar.java

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

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

RelativeLayout.java

Fixes 2017393. Correctly apply gravity in RelativeLayout.

2009-07-28 11:18:14 -07:00

RemoteViews.aidl

auto import from //depot/cupcake/@135843

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

RemoteViews.java

Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:27:19 -08:00

ResourceCursorAdapter.java

AI 145994: Integrate #145778 from Donut.

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

ResourceCursorTreeAdapter.java

auto import from //depot/cupcake/@135843

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

ScrollBarDrawable.java

auto import from //depot/cupcake/@135843

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

Scroller.java

accelerate consecutive flings

2009-09-01 09:34:21 -04:00

ScrollView.java

Fading scrollbars return. But you have to opt in.

2009-09-28 10:47:04 -07:00

SectionIndexer.java

auto import from //depot/cupcake/@135843

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

SeekBar.java

auto import from //depot/cupcake/@135843

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

SimpleAdapter.java

Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.

2009-05-06 11:12:38 -07:00

SimpleCursorAdapter.java

Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.

2009-05-06 11:12:38 -07:00

SimpleCursorTreeAdapter.java

Add ViewBinder & setText APIs to match SimpleCursorAdapter

2009-06-11 12:17:50 -07:00

SimpleExpandableListAdapter.java

auto import from //depot/cupcake/@135843

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

SlidingDrawer.java

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

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

Spinner.java

Fixes #1844366. Prevents window leak in Spinner.

2009-07-15 17:01:48 -07:00

SpinnerAdapter.java

auto import from //depot/cupcake/@135843

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

TabHost.java

Fix 2146581: Make tabs work for donut apps

2009-09-25 17:53:56 -07:00

TableLayout.java

auto import from //depot/cupcake/@135843

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

TableRow.java

auto import from //depot/cupcake/@135843

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

TabWidget.java

Fix 2146581: Make tabs work for donut apps

2009-09-25 17:53:56 -07:00

TextSwitcher.java

auto import from //depot/cupcake/@135843

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

TextView.java

am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.

2009-11-04 06:10:26 -08:00

TimePicker.java

auto import from //depot/cupcake/@135843

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

Toast.java

Cleanup Toast.java.

2009-07-08 11:59:00 -07:00

ToggleButton.java

auto import from //depot/cupcake/@135843

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

TwoLineListItem.java

AI 143364: am: CL 143214 am: CL 143009 More work on issue #1739507 (kila-user build is too big): remove some unused application resources I found.

2009-03-27 19:19:20 -07:00

VideoView.java

Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.

2009-09-30 14:54:55 +01:00

ViewAnimator.java

Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:27:19 -08:00

ViewFlipper.java

Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:27:19 -08:00

ViewSwitcher.java

Add support for gestures in Home.

2009-06-09 22:58:46 -07:00

WrapperListAdapter.java

auto import from //depot/cupcake/@135843

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

ZoomButton.java

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

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

ZoomButtonsController.java

Some improvements for wallpaper configuration.

2009-09-15 18:59:31 -07:00

ZoomControls.java

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

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