Marco Nelissen a80ac05f85 resolved conflicts for merge of 42f55d1e to master ...

Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec

2015-03-12 16:17:45 -07:00

..

AbsListView.java

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

AbsoluteLayout.java

…

AbsSeekBar.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

AbsSpinner.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

AccessibilityIterators.java

…

ActionMenuPresenter.java

MenuItem, navigation and overflow icon tinting

2015-02-27 08:56:04 +00:00

ActionMenuView.java

MenuItem, navigation and overflow icon tinting

2015-02-27 08:56:04 +00:00

ActivityChooserModel.java

…

ActivityChooserView.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

Adapter.java

…

AdapterView.java

Add more @Nullable annotations

2015-03-06 17:24:58 -08:00

AdapterViewAnimator.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

AdapterViewFlipper.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Advanceable.java

…

AlphabetIndexer.java

…

AnalogClock.java

…

AppSecurityPermissions.java

…

ArrayAdapter.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

AutoCompleteTextView.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

BaseAdapter.java

…

BaseExpandableListAdapter.java

…

Button.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

CalendarView.java

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

CalendarViewLegacyDelegate.java

…

CalendarViewMaterialDelegate.java

…

Checkable.java

…

CheckBox.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

CheckedTextView.java

Clean up AlertDialog javadocs, add overlay theme for dialogs

2015-02-23 17:15:27 -08:00

Chronometer.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

CompoundButton.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

CursorAdapter.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

CursorFilter.java

…

CursorTreeAdapter.java

…

DatePicker.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

DatePickerCalendarDelegate.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

DatePickerController.java

…

DateTimeView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

DayPickerView.java

Merge "Fix accessibility delegation"

2015-01-08 00:07:25 +00:00

DialerFilter.java

…

DigitalClock.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

DoubleDigitManager.java

…

EdgeEffect.java

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

Editor.java

Merge "Fix negative touch word offset that caused crashing when selecting text"

2015-03-12 21:45:22 +00:00

EditText.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ExpandableListAdapter.java

…

ExpandableListConnector.java

…

ExpandableListPosition.java

…

ExpandableListView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

FastScroller.java

Update scrollbars to match Material spec

2014-11-20 16:07:59 -08:00

Filter.java

…

Filterable.java

…

FilterQueryProvider.java

…

FrameLayout.java

Merge "Add more @Nullable annotations"

2015-03-07 01:34:49 +00:00

Gallery.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

GridLayout.java

Merge "Remove original movements record from GridLayout"

2015-03-07 00:09:31 +00:00

GridView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

HeaderViewListAdapter.java

…

HeterogeneousExpandableList.java

…

HorizontalScrollView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ImageButton.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ImageSwitcher.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ImageView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

LinearLayout.java

Merge "Allow attrs to be @Nullable in TextView and LinearLayout"

2015-03-06 18:45:25 +00:00

ListAdapter.java

…

ListPopupWindow.java

Prevent drag-to-open from cycling pressed state, propagate hotspot

2015-01-26 10:24:08 -08:00

ListView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

MediaController.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

MultiAutoCompleteTextView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

NumberPicker.java

Fix accessibility delegation

2015-01-07 16:05:02 -08:00

OnDateChangedListener.java

…

OverScroller.java

…

package.html

…

PopupMenu.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

PopupWindow.java

Various fixes for popup monkey testing

2015-03-11 12:21:30 -07:00

ProgressBar.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

QuickContactBadge.java

QuickContacts can prioritize phone mimetype. Part1

2015-02-26 11:47:25 -08:00

RadialTimePickerView.java

Implement landscape layout for time picker dialog

2015-02-26 09:47:10 -08:00

RadioButton.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

RadioGroup.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

RatingBar.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

RelativeLayout.java

Revert RelativeLayout's baseline view to API 22 and below behavior

2015-03-09 18:01:19 -07:00

RemoteViews.aidl

…

RemoteViews.java

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

RemoteViewsAdapter.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

RemoteViewsListAdapter.java

…

RemoteViewsService.java

…

ResourceCursorAdapter.java

Add popup theme for Spinner, use for actionBarPopupTheme default

2015-01-14 10:43:31 -08:00

ResourceCursorTreeAdapter.java

…

RtlSpacingHelper.java

…

ScrollBarDrawable.java

Improve docs for drawable tint and color filters

2015-03-02 16:21:02 -08:00

Scroller.java

…

ScrollView.java

First quick implementation of auto assist data.

2015-02-06 10:42:44 -08:00

SearchView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

SectionIndexer.java

…

SeekBar.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ShareActionProvider.java

…

SimpleAdapter.java

Add popup theme for Spinner, use for actionBarPopupTheme default

2015-01-14 10:43:31 -08:00

SimpleCursorAdapter.java

…

SimpleCursorTreeAdapter.java

…

SimpleExpandableListAdapter.java

…

SimpleMonthAdapter.java

Fix date picker color handling, expose StateSet utils in more places

2015-01-07 13:57:12 -08:00

SimpleMonthView.java

Use text ascent / descent to center SimpleMonthView labels

2015-01-08 11:12:39 -08:00

SlidingDrawer.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Space.java

…

SpellChecker.java

Add a check for invalid spans being set by SpellChecker.

2015-03-11 11:09:34 -07:00

Spinner.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

SpinnerAdapter.java

Add popup theme for Spinner, use for actionBarPopupTheme default

2015-01-14 10:43:31 -08:00

StackView.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

SuggestionsAdapter.java

Add popup theme for Spinner, use for actionBarPopupTheme default

2015-01-14 10:43:31 -08:00

Switch.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

TabHost.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TableLayout.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TableRow.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TabWidget.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TextClock.java

resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp

2014-11-25 15:34:56 +01:00

TextSwitcher.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TextView.java

Move the "Replace" popup option to the Text Selection ActionMode.

2015-03-12 10:31:11 +00:00

TextViewWithCircularIndicator.java

Update year picker to use activation colors

2015-01-08 15:25:30 -08:00

TimePicker.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TimePickerClockDelegate.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TimePickerSpinnerDelegate.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Toast.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

ToggleButton.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Toolbar.java

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

TwoLineListItem.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

VideoView.java

resolved conflicts for merge of 42f55d1e to master

2015-03-12 16:17:45 -07:00

ViewAnimator.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ViewFlipper.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ViewSwitcher.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

WrapperListAdapter.java

…

YearPickerView.java

Update year picker to use activation colors

2015-01-08 15:25:30 -08:00

ZoomButton.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ZoomButtonsController.java

…

ZoomControls.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00