Elliott Hughes f8abeb8457 resolved conflicts for merge of 04c987a8 to master ...

Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe

2014-05-30 20:13:15 -07:00

..

AbsListView.java

TouchFeedbackDrawable is now RippleDrawable

2014-05-19 16:27:31 -07:00

AbsoluteLayout.java

Clean up layout constructors, make them consistent

2013-09-10 17:03:02 -07:00

AbsSeekBar.java

Update switch, checkbox, radio button, button, and toggle button

2014-05-22 22:43:59 -07:00

AbsSpinner.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

AccessibilityIterators.java

…

ActionMenuPresenter.java

Toolbar factoring and ActionBar functionality integration

2014-05-28 12:36:38 -07:00

ActionMenuView.java

Toolbar factoring and ActionBar functionality integration

2014-05-28 12:36:38 -07:00

ActivityChooserModel.java

Share pack historical sorting using wrong keys.

2013-10-28 18:43:08 -07:00

ActivityChooserView.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Adapter.java

…

AdapterView.java

am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."

2014-02-21 17:37:54 +00:00

AdapterViewAnimator.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

AdapterViewFlipper.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

Advanceable.java

…

AlphabetIndexer.java

…

AnalogClock.java

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

AppSecurityPermissions.java

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

ArrayAdapter.java

Clarify javadoc and parameter names

2013-01-09 20:16:37 -08:00

AutoCompleteTextView.java

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

BaseAdapter.java

Fix some documentation typos.

2013-11-01 02:38:01 +00:00

BaseExpandableListAdapter.java

…

Button.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

CalendarView.java

Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE

2014-03-05 18:42:56 +00:00

Checkable.java

…

CheckBox.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

CheckedTextView.java

Update switch, checkbox, radio button, button, and toggle button

2014-05-22 22:43:59 -07:00

Chronometer.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

CompoundButton.java

TouchFeedbackDrawable is now RippleDrawable

2014-05-19 16:27:31 -07:00

CursorAdapter.java

Add warning about using MergeCursor in CursorAdapter

2013-09-26 14:38:14 -07:00

CursorFilter.java

…

CursorTreeAdapter.java

Before requerying a cursor, check if it is closed.

2013-11-11 15:58:13 +09:00

DatePicker.java

resolved conflicts for merge of 04c987a8 to master

2014-05-30 20:13:15 -07:00

DateTimeView.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

DialerFilter.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

DigitalClock.java

Clean up (some of) our many clocks to use H instead of k.

2013-03-18 17:21:33 -07:00

DoubleDigitManager.java

…

EdgeEffect.java

Tweak EdgeEffect

2014-05-13 19:05:53 -07:00

Editor.java

Enable CursorAnchorInfo to contain composing string

2014-05-14 19:28:59 +09:00

EditText.java

add new accessibility action for EditText to set text content

2014-02-20 20:05:34 -08:00

ExpandableListAdapter.java

…

ExpandableListConnector.java

…

ExpandableListPosition.java

…

ExpandableListView.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

FastScroller.java

DO NOT MERGE Quick fix for updating the FastScroller long list property

2014-03-07 16:50:24 -08:00

Filter.java

…

Filterable.java

…

FilterQueryProvider.java

…

FrameLayout.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

Gallery.java

Adds API for determining confirm and cancel keys.

2014-03-26 14:40:42 -07:00

GridLayout.java

More on weights in GridLayout

2014-05-24 21:02:45 -07:00

GridView.java

Check for null view root before checking for accessibility focus

2014-02-24 11:09:18 -08:00

HeaderViewListAdapter.java

am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev

2013-06-12 21:11:12 -07:00

HeterogeneousExpandableList.java

…

HorizontalScrollView.java

New, inkier EdgeEffect visual style

2014-05-11 15:27:57 -07:00

ImageButton.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ImageSwitcher.java

…

ImageView.java

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

LegacyTimePickerDelegate.java

Update TimePicker widget and its related dialog

2013-09-27 12:09:41 -07:00

LinearLayout.java

Force measurement in LinearLayout if any views are skipped

2014-02-24 18:21:09 -08:00

ListAdapter.java

…

ListPopupWindow.java

Add support for popups overlapping anchors

2014-05-05 14:40:07 -07:00

ListView.java

Support for list selector ripple during arrow movement & drag

2014-05-01 17:20:55 -07:00

MediaController.java

MediaController does not check for cancelled motions in onTouchEvent, causing

2013-11-15 17:14:35 -08:00

MultiAutoCompleteTextView.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

NumberPicker.java

am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"

2014-04-11 17:40:39 +00:00

OverScroller.java

Fix the build, use viscous fluid interpolator in OverScroller

2013-09-04 16:37:57 -07:00

package.html

…

PopupMenu.java

Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu

2013-09-26 15:49:27 -07:00

PopupWindow.java

Add support for popups overlapping anchors

2014-05-05 14:40:07 -07:00

ProgressBar.java

Support for hollow switch and seek bar thumbs

2014-05-12 10:55:37 -07:00

QuickContactBadge.java

Add setOverlay method to QuickContactsBadge

2014-04-28 13:57:04 -07:00

RadialTimePickerView.java

Update TimePicker widget and its related dialog

2013-09-27 12:09:41 -07:00

RadioButton.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

RadioGroup.java

…

RatingBar.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

RelativeLayout.java

Fix RelativeLayout measurement

2014-02-12 15:49:18 -08:00

RemoteViews.aidl

…

RemoteViews.java

Move legacy notification processing to Notification.Builder

2014-03-27 12:08:55 +01:00

RemoteViewsAdapter.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

RemoteViewsListAdapter.java

Updating new widget api to account for view type count

2013-01-10 19:23:39 -08:00

RemoteViewsService.java

…

ResourceCursorAdapter.java

…

ResourceCursorTreeAdapter.java

…

RtlSpacingHelper.java

Add content insets to Toolbar

2014-05-15 15:11:40 -07:00

ScrollBarDrawable.java

add getAlpha() to Drawable

2013-03-08 15:40:28 -08:00

Scroller.java

Fix the build, use viscous fluid interpolator in OverScroller

2013-09-04 16:37:57 -07:00

ScrollView.java

New, inkier EdgeEffect visual style

2014-05-11 15:27:57 -07:00

SearchView.java

SearchView improvement for IME

2014-03-28 15:56:51 -07:00

SectionIndexer.java

Update documentation for FastScroller and SectionIndexer

2013-08-15 18:16:06 -07:00

SeekBar.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

ShareActionProvider.java

Make ChooserActivity intents doccentric and transitory

2014-05-08 12:43:50 -07:00

SimpleAdapter.java

…

SimpleCursorAdapter.java

…

SimpleCursorTreeAdapter.java

…

SimpleExpandableListAdapter.java

…

SlidingDrawer.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

Space.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SpellChecker.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

Spinner.java

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

SpinnerAdapter.java

…

StackView.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

SuggestionsAdapter.java

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

Switch.java

Update switch, checkbox, radio button, button, and toggle button

2014-05-22 22:43:59 -07:00

TabHost.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

TableLayout.java

…

TableRow.java

am d31f0ab9: am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev

2012-10-29 17:14:54 -07:00

TabWidget.java

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

TextClock.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

TextSwitcher.java

…

TextView.java

Fix password obscuring in TextView accessibility node

2014-05-19 16:04:40 -07:00

TimePicker.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

TimePickerDelegate.java

Don't use TypedArray after recycling it

2014-04-02 16:46:31 -07:00

Toast.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ToggleButton.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

Toolbar.java

Collapse contentInsets and View margins in Toolbars

2014-05-30 18:52:37 -07:00

TwoLineListItem.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

VideoView.java

Implements TtmlRenderer.

2014-05-14 21:28:14 +09:00

ViewAnimator.java

…

ViewFlipper.java

Register receivers from ViewFlipper with an explicit Handler

2013-10-16 16:43:41 -07:00

ViewSwitcher.java

…

WrapperListAdapter.java

…

ZoomButton.java

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

ZoomButtonsController.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ZoomControls.java

…