Jim Miller 839458d8d4 resolved conflicts for merge of e03952c0 to master ...

Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0

2010-07-14 17:21:00 -07:00

..

accessibility

2604184 Expose hidden APIs for testing the AccessibilityManager separately from the backing AccessibilityManagerServcie

2010-04-16 18:19:33 -07:00

animation

Fix bug with layout animations when apps are auto-scaled.

2010-06-16 14:17:55 -07:00

inputmethod

…

AbsSavedState.java

Cosmetic changes around TextView.

2010-07-13 15:07:39 -07:00

ContextMenu.java

…

ContextThemeWrapper.java

…

Display.java

…

FocusFinder.java

…

FocusFinderHelper.java

…

GestureDetector.java

…

GLES20Canvas.java

Correctly support pre-multiplied alpha, optimizations, more stuff.

2010-07-12 20:20:03 -07:00

Gravity.java

…

HapticFeedbackConstants.java

…

HardwareRenderer.java

Remove support for density compatibility in the hardware renderer.

2010-07-09 10:36:05 -07:00

IApplicationToken.aidl

…

InflateException.java

…

InputChannel.aidl

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

InputChannel.java

First stab at attaching native event dispatching.

2010-06-22 11:21:50 -07:00

InputHandler.java

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

InputQueue.java

Remove InputConsumer, replacing with InputQueue.

2010-06-23 14:37:30 -07:00

IOnKeyguardExitResult.aidl

…

IRotationWatcher.aidl

…

IWindow.aidl

More native input dispatch work.

2010-07-03 19:23:01 -07:00

IWindowManager.aidl

…

IWindowSession.aidl

More native input dispatch work.

2010-07-03 19:23:01 -07:00

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

Add initial gamepad support.

2010-07-13 17:04:57 -07:00

LayoutInflater.java

Removed API changes from CL 54712.

2010-06-17 10:57:42 -07:00

Menu.java

…

MenuInflater.java

Added context modes to ActionBar API.

2010-06-29 14:04:58 -07:00

MenuItem.java

Added context modes to ActionBar API.

2010-06-29 14:04:58 -07:00

MotionEvent.aidl

…

MotionEvent.java

Cosmetic changes around TextView.

2010-07-13 15:07:39 -07:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

RemotableViewMethod.java

…

ScaleGestureDetector.java

…

SoundEffectConstants.java

…

SubMenu.java

…

Surface.aidl

…

Surface.java

resolved conflicts for merge of 86303198 to kraken

2010-04-26 17:42:07 -07:00

SurfaceHolder.java

IME events are now dispatched to native applications.

2010-07-13 18:36:46 -07:00

SurfaceSession.java

…

SurfaceView.java

Argh oops I didn't mean to delete this.

2010-07-14 17:09:47 -07:00

TouchDelegate.java

…

VelocityTracker.java

merge from open-source master

2010-05-13 14:50:16 -07:00

View.java

resolved conflicts for merge of e03952c0 to master

2010-07-14 17:21:00 -07:00

ViewConfiguration.java

…

ViewDebug.java

…

ViewGroup.java

am bc337d2f: am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread

2010-06-23 12:41:46 -07:00

ViewManager.java

…

ViewParent.java

…

ViewRoot.java

am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.

2010-07-13 19:50:36 -07:00

ViewStub.java

…

ViewTreeObserver.java

…

VolumePanel.java

…

Window.java

am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.

2010-07-13 19:50:36 -07:00

WindowManager.aidl

…

WindowManager.java

Revised "immersive mode" API.

2010-06-22 12:30:12 -04:00

WindowManagerImpl.java

…

WindowManagerPolicy.java

More native input dispatch work.

2010-07-03 19:23:01 -07:00

WindowOrientationListener.java

Fix a minor bug in transitions to left-edge-up landscape.

2010-04-28 15:08:45 -07:00