Scott Main 0aa8f3b8db resolved conflicts for merge of 20d06540 to master ...

Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef

2012-01-31 08:55:23 -08:00

..

AbsListView.java

Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."

2012-01-17 17:25:56 -08:00

AbsoluteLayout.java

…

AbsSeekBar.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

AbsSpinner.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ActivityChooserModel.java

Update the sharing UI according to latest UX specs.

2011-09-08 18:19:13 -07:00

ActivityChooserView.java

Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."

2012-01-24 13:58:41 -08:00

Adapter.java

…

AdapterView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

AdapterViewAnimator.java

Fix issue 5905210, AdapterViewAnimator sending negative index to Adapter

2012-01-23 19:12:22 -08:00

AdapterViewFlipper.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Advanceable.java

…

AlphabetIndexer.java

…

AnalogClock.java

Accessibility services cannot obtain the source of an event coming from a root namespace descendant.

2011-10-03 15:07:44 -07:00

AppSecurityPermissions.java

…

ArrayAdapter.java

Fix synchronization issue in ArrayAdapter

2011-08-15 15:48:17 -07:00

AutoCompleteTextView.java

AOOB in AutoComplete

2012-01-18 18:39:10 -08:00

BaseAdapter.java

Improve docs in BaseAdapter.

2011-09-27 11:32:59 -07:00

BaseExpandableListAdapter.java

…

Button.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

CalendarView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Checkable.java

…

CheckBox.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

CheckedTextView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Chronometer.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

CompoundButton.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

CursorAdapter.java

…

CursorFilter.java

…

CursorTreeAdapter.java

…

DatePicker.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

DateTimeView.java

…

DialerFilter.java

…

DigitalClock.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

DoubleDigitManager.java

…

EdgeEffect.java

Localized optimizations in views and bitmaps

2011-11-11 12:46:48 -08:00

EditText.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ExpandableListAdapter.java

…

ExpandableListConnector.java

…

ExpandableListPosition.java

…

ExpandableListView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

FastScroller.java

Fix bug 5173029 - make fast scroller aware of scrolling containers

2011-10-11 19:06:13 -07:00

Filter.java

…

Filterable.java

…

FilterQueryProvider.java

…

FrameLayout.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Gallery.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

GridLayout.java

Fix bug in LayoutTransition for INVISIBLE views

2012-01-30 07:53:59 -08:00

GridView.java

Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."

2012-01-17 17:25:56 -08:00

HeaderViewListAdapter.java

…

HeterogeneousExpandableList.java

…

HorizontalScrollView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ImageButton.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ImageSwitcher.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ImageView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

LinearLayout.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ListAdapter.java

…

ListPopupWindow.java

Un-force fading edges in ListPopupWindows.

2011-09-13 21:43:29 -07:00

ListView.java

Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."

2012-01-17 17:25:56 -08:00

MediaController.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

MultiAutoCompleteTextView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

NumberPicker.java

resolved conflicts for merge of 20d06540 to master

2012-01-31 08:55:23 -08:00

OverScroller.java

Tuning Overscroller's scroll curve

2011-09-19 17:52:06 -07:00

package.html

…

PopupMenu.java

Fix bug 5300621 - Share menu disappears in gallery

2011-09-21 17:21:47 -07:00

PopupWindow.java

PopupWindow dismiss() can get into a recursive loop.

2011-11-10 14:31:41 -08:00

ProgressBar.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

QuickContactBadge.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

RadioButton.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

RadioGroup.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

RatingBar.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

RelativeLayout.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

RemoteViews.aidl

…

RemoteViews.java

Add content description setter to RemoteViews

2011-10-18 18:01:47 -07:00

RemoteViewsAdapter.java

Hinting RemoteViewsAdapter as to which views are visible

2012-01-17 15:21:34 -08:00

RemoteViewsService.java

Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)

2011-12-06 14:21:10 -08:00

ResourceCursorAdapter.java

…

ResourceCursorTreeAdapter.java

…

ScrollBarDrawable.java

…

Scroller.java

Make EdgeEffect public API.

2011-08-31 14:59:19 -07:00

ScrollView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

SearchView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

SectionIndexer.java

…

SeekBar.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ShareActionProvider.java

Update ShareActionProvider to clear the sharing activity when the task

2012-01-24 13:46:45 -08:00

SimpleAdapter.java

…

SimpleCursorAdapter.java

…

SimpleCursorTreeAdapter.java

…

SimpleExpandableListAdapter.java

…

SlidingDrawer.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Space.java

Fix for 5393156

2011-09-29 14:48:44 -07:00

SpellChecker.java

Modified algorithm to remove duplicated suggestions

2012-01-25 15:07:50 -08:00

Spinner.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

SpinnerAdapter.java

…

StackView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

SuggestionsAdapter.java

Close suggestions cursor when SearchView is detached.

2011-11-03 11:32:44 -07:00

Switch.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TabHost.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TableLayout.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TableRow.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TabWidget.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TextSwitcher.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TextView.java

Merge "Add debug markers to OpenGLRenderer"

2012-01-30 17:43:37 -08:00

TimePicker.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

Toast.java

docs: add developer guide cross-references, Project ACRE, Round 2

2011-10-14 10:18:33 -07:00

ToggleButton.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

TwoLineListItem.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

VideoView.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ViewAnimator.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ViewFlipper.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ViewSwitcher.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

WrapperListAdapter.java

…

ZoomButton.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00

ZoomButtonsController.java

…

ZoomControls.java

AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.

2012-01-17 14:51:45 -08:00