Adam Powell f37df070ea resolved conflicts for merge of b39470b5 to master ...

Change-Id: If441c8684c576b6cbc485a37088d6869ad3fb23f

2010-09-17 17:59:06 -07:00

..

AbsListView.java

Prevent multiple RemoteViewAdapters from being set for the same intent.

2010-09-16 16:59:56 -07:00

AbsoluteLayout.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

AbsSeekBar.java

Ignore key events when the widget is disabled.

2010-01-04 15:39:40 -08:00

AbsSpinner.java

Prevent crash in AbsSpinner when the selection is out of sync.

2010-02-22 16:48:47 -08:00

Adapter.java

…

Adapters.java

New XmlDocumentProvider class.

2010-06-23 10:43:00 -07:00

AdapterView.java

am 7d04f2bc: am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread

2010-08-30 18:38:14 -07:00

AdapterViewAnimator.java

Prevent multiple RemoteViewAdapters from being set for the same intent.

2010-09-16 16:59:56 -07:00

AdapterViewFlipper.java

-> Added 3D rotation to the StackView transition

2010-08-17 17:29:36 -07:00

AlphabetIndexer.java

eclair snapshot

2009-11-13 13:53:39 -08:00

AnalogClock.java

…

AppSecurityPermissions.java

More device admin work: description, policy control.

2010-01-26 12:28:15 -08:00

ArrayAdapter.java

New two-pane mode for PreferenceActivity.

2010-08-03 11:18:23 -07:00

AutoCompleteTextView.java

am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-21 09:44:53 -07:00

BaseAdapter.java

…

BaseExpandableListAdapter.java

Fixed doc typos in HeterogeneousExpandableList.java.

2010-07-29 16:56:25 -07:00

Button.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

Checkable.java

…

CheckBox.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

CheckedTextView.java

am 563d3a62: merge from open-source master

2010-02-24 11:19:12 -08:00

Chronometer.java

…

CompoundButton.java

These changes add access to some status values in widgets listed below:

2010-02-23 16:39:08 -08:00

CursorAdapter.java

Fix a bug I introduced in CursorAdapter.

2010-04-22 11:26:06 -05:00

CursorFilter.java

…

CursorTreeAdapter.java

Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.

2010-07-08 09:02:48 -05:00

DatePicker.java

am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:37:31 -07:00

DateTimeView.java

Fix bug 2531732 - DateTimeView explodes on bad system date format.

2010-03-23 17:32:41 -07:00

DialerFilter.java

…

DigitalClock.java

…

DoubleDigitManager.java

…

EditText.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

ExpandableListAdapter.java

New HeterogeneousExpandableList interface.

2010-03-19 11:15:49 -07:00

ExpandableListConnector.java

New HeterogeneousExpandableList interface.

2010-03-19 11:15:49 -07:00

ExpandableListPosition.java

…

ExpandableListView.java

More ExpandableListView fixes to take headers into account.

2010-03-03 15:55:13 -08:00

FastScroller.java

FastScroller now reports scroll state changes for its associated AbsListView

2010-02-26 16:29:09 -08:00

Filter.java

donut snapshot

2009-07-29 14:25:07 -07:00

Filterable.java

…

FilterQueryProvider.java

…

FrameLayout.java

Update FrameLayout documentation.

2010-08-17 12:43:05 -07:00

Gallery.java

am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-21 09:44:53 -07:00

GridView.java

Add a new "activated" state to View.

2010-09-15 11:00:44 -07:00

HeaderViewListAdapter.java

null header and footer allowed in HeaderViewListAdapter.

2010-03-24 15:27:41 -07:00

HeterogeneousExpandableList.java

Fixed doc typos in HeterogeneousExpandableList.java.

2010-07-29 16:56:25 -07:00

HorizontalScrollView.java

Fix bug 2973252 - Make overscroll glow respect ifContentScrolls

2010-09-03 12:06:51 -07:00

ImageButton.java

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -07:00

ImageSwitcher.java

…

ImageView.java

Document blocking behavior of ImageView setImageURI and setImageResource

2010-08-27 11:43:56 -07:00

LinearLayout.java

am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-21 09:44:53 -07:00

ListAdapter.java

Fixes for HeaderViewListAdapter.

2010-03-24 15:09:50 -07:00

ListPopupWindow.java

Style new popup widgets.

2010-09-15 14:39:48 -07:00

ListView.java

Add a new "activated" state to View.

2010-09-15 11:00:44 -07:00

MediaController.java

merge from open-source master

2010-06-02 08:54:47 -07:00

MultiAutoCompleteTextView.java

donut snapshot

2009-07-21 11:16:54 -07:00

NumberPicker.java

Correctly validate numbers when pasted in NumberPicker.

2010-03-05 17:33:20 -08:00

NumberPickerButton.java

Fix number counter will keep going after window losed focus.

2010-09-03 12:06:20 +08:00

package.html

…

PopupMenu.java

Added android.widget.PopupMenu

2010-08-04 11:06:22 -07:00

PopupWindow.java

Fix bug 2927837 - PopupWindows don't account for xlarge status bar height

2010-08-17 21:17:04 -07:00

ProgressBar.java

am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread

2010-08-24 11:01:14 -07:00

QuickContactBadge.java

am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread

2010-09-07 15:16:44 -07:00

RadioButton.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

RadioGroup.java

…

RatingBar.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

RelativeLayout.java

am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:37:31 -07:00

RemoteViews.aidl

…

RemoteViews.java

Modifying API for setting on-click intents for items

2010-09-16 19:24:20 -07:00

RemoteViewsAdapter.java

Prevent multiple RemoteViewAdapters from being set for the same intent.

2010-09-16 16:59:56 -07:00

RemoteViewsService.java

Modifying API for setting on-click intents for items

2010-09-16 19:24:20 -07:00

ResourceCursorAdapter.java

Add a constructor from CursorAdapter to ResourceCursorAdapter.

2010-08-10 16:17:09 -05:00

ResourceCursorTreeAdapter.java

…

ScrollBarDrawable.java

Fix save()/restore() issues in the OpenGL renderer.

2010-08-17 18:40:21 -07:00

Scroller.java

New edge effects for scrolling widgets (overscroll)

2010-08-30 19:14:07 -07:00

ScrollView.java

Fix bug 2973252 - Make overscroll glow respect ifContentScrolls

2010-09-03 12:06:51 -07:00

SearchView.java

Query refinement feature in SearchView.

2010-09-16 06:37:26 -07:00

SectionIndexer.java

…

SeekBar.java

…

SimpleAdapter.java

Correctly bind spinner data to TextView.

2010-03-23 12:42:51 -07:00

SimpleCursorAdapter.java

Add support for XML-defined adapters.

2010-03-31 16:07:35 -07:00

SimpleCursorTreeAdapter.java

Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.

2010-07-08 09:02:48 -05:00

SimpleExpandableListAdapter.java

…

SlidingDrawer.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

Spinner.java

Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode

2010-09-02 15:56:04 -07:00

SpinnerAdapter.java

…

StackView.java

Fixing StackView rendering bug exposed by recent Launcher change

2010-09-16 15:27:20 -07:00

SuggestionsAdapter.java

Query refinement feature in SearchView.

2010-09-16 06:37:26 -07:00

TabHost.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

TableLayout.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

TableRow.java

Categorizing exported view properties.

2010-08-10 17:45:03 -07:00

TabWidget.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

TextSwitcher.java

…

TextView.java

resolved conflicts for merge of b39470b5 to master

2010-09-17 17:59:06 -07:00

TimePicker.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

Toast.java

donut snapshot

2009-07-29 14:25:07 -07:00

ToggleButton.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

TwoLineListItem.java

…

VideoView.java

Release MediaPlayer if suspend() returns false.

2010-03-18 15:44:30 -07:00

ViewAnimator.java

Modified first animation and visibility change behavior for ViewFlipper

2010-06-16 13:38:15 -07:00

ViewFlipper.java

Modified first animation and visibility change behavior for ViewFlipper

2010-06-16 13:38:15 -07:00

ViewSwitcher.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

WrapperListAdapter.java

…

ZoomButton.java

…

ZoomButtonsController.java

Hide zoom buttons when a view gets hidden, i.e. by a TabHost

2010-04-13 11:55:02 -07:00

ZoomControls.java

…