Mike LeBeau 21373aaef2 resolved conflicts for merge of 174231 to master

2009-06-11 18:50:27 +01:00

..

AbsListView.java

Removes gestures from ListView.

2009-06-08 23:24:18 -07:00

AbsoluteLayout.java

auto import from //depot/cupcake/@135843

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

AbsSeekBar.java

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07: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

Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id.

2009-05-27 14:14:09 -07:00

ArrayAdapter.java

Hand merge from cupcake_dcm to donut, part 2.

2009-05-19 08:26:32 +09:00

AutoCompleteTextView.java

resolved conflicts for merge of 174231 to master

2009-06-11 18:50:27 +01: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

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

2009-05-14 23:47:05 -07: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

auto import from //depot/cupcake/@135843

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

Fixes external http://code.google.com/p/android/issues/detail?id=2732. ExpandableListView is wrongly assuming that the saved state if of the correct type. A similar bug fix was made in TextView.onRestoreInstanceState() a while ago. This fix simply ensures that the state received is of the right type.

2009-05-21 12:54:16 -07:00

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

Filter.java

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -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

auto import from //depot/cupcake/@135843

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

GridView.java

Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.

2009-05-04 16:24:39 -07:00

HeaderViewListAdapter.java

auto import from //depot/cupcake/@135843

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

HorizontalScrollView.java

Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575). HorizontalScrollView was comparing the measured height of its child to its width.

2009-05-04 14:15:23 -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

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

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

LinearLayout.java

auto import from //depot/cupcake/@135843

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

ListAdapter.java

auto import from //depot/cupcake/@135843

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

ListView.java

Avoid touching all adapter items when building accessibility event.

2009-06-04 14:00:20 -07:00

MediaController.java

Ensure ongoing progress updates after using the scroll ball to adjust position.

2009-04-20 16:56:04 -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

Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.

2009-05-22 01:59:59 -07:00

ProgressBar.java

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

2009-03-13 13:04:22 -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

Fix int to string mapping of exported properties. The value generated by the

2009-06-04 15:10:46 -07:00

RemoteViews.aidl

auto import from //depot/cupcake/@135843

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

RemoteViews.java

Automated import from //branches/master/...@142308,142308

2009-03-24 22:34:00 -07: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

AI 145994: Integrate #145778 from Donut.

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

ScrollView.java

auto import from //depot/cupcake/@135843

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

auto import from //depot/cupcake/@135843

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

auto import from //depot/cupcake/@135843

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

SpinnerAdapter.java

auto import from //depot/cupcake/@135843

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

TabHost.java

Add support for custom tab views in TabHost and TabWidget.

2009-06-10 11:38:02 -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

Add support for custom tab views in TabHost and TabWidget.

2009-06-10 11:38:02 -07:00

TextSwitcher.java

auto import from //depot/cupcake/@135843

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

TextView.java

Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.

2009-05-22 01:59:59 -07:00

TimePicker.java

auto import from //depot/cupcake/@135843

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

Toast.java

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

2009-05-14 23:47:05 -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

AI 145994: Integrate #145778 from Donut.

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

ViewAnimator.java

auto import from //depot/cupcake/@135843

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

ViewFlipper.java

auto import from //depot/cupcake/@135843

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

Check if the ownerView is still attached to window in

2009-05-27 17:56:17 -07:00

ZoomControls.java

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

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