Kenny Root 8db59adccf resolved conflicts for merge of b037da40 to master ...

Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121

2010-08-24 11:48:37 -07:00

..

AbsListView.java

Add selection mode support to GridView.

2010-08-16 11:05:57 -07:00

AbsoluteLayout.java

…

AbsSeekBar.java

…

AbsSpinner.java

…

Adapter.java

…

Adapters.java

New XmlDocumentProvider class.

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

AdapterView.java

Categorizing exported view properties.

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

AdapterViewAnimator.java

-> Added edge behaviour for StackView (what to do at

2010-08-18 22:01:13 -07:00

AdapterViewFlipper.java

-> Added 3D rotation to the StackView transition

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

AlphabetIndexer.java

…

AnalogClock.java

…

AppSecurityPermissions.java

…

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

…

Chronometer.java

…

CompoundButton.java

…

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

…

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

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

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

Add documentation for fillViewport.

2010-08-16 10:55:49 -07:00

ImageButton.java

docs: add links from widget classes to tutorials

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

ImageSwitcher.java

…

ImageView.java

Round up ImageView translations to avoid nasty surprises.

2010-03-15 17:53:37 -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

More ActionBar/config change tweaks. Preserve open overflow menus

2010-08-23 10:24:49 -07:00

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

MediaController.java

merge from open-source master

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

MultiAutoCompleteTextView.java

…

NumberPicker.java

Correctly validate numbers when pasted in NumberPicker.

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

NumberPickerButton.java

…

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

Clean up the fallback state of QuickContact

2010-04-14 16:45:07 -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

-> Enabled partial updates to app widgets through AppWidgetManager.

2010-08-17 10:29:35 -07:00

RemoteViewsAdapter.java

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

2010-08-17 14:25:06 -07:00

RemoteViewsService.java

Fixing link in RemoteViewsFactory comment.

2010-08-17 18:16:47 -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

DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller

2010-08-05 15:50:31 -07:00

ScrollView.java

Add documentation for fillViewport.

2010-08-16 10:55:49 -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

…

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

SpinnerAdapter.java

…

StackView.java

-> Added edge behaviour for StackView (what to do at

2010-08-18 22:01:13 -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 b037da40 to master

2010-08-24 11:48:37 -07:00

TimePicker.java

docs: add links from widget classes to tutorials

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

Toast.java

…

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

…

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

…