Marco Nelissen 55fb51aa41 resolved conflicts for merge of 86303198 to kraken ...

Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f

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

..

accessibility

…

animation

New OverScroller with edge bouncing effect.

2010-03-19 12:23:09 -07:00

inputmethod

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

AbsSavedState.java

…

ContextMenu.java

…

ContextThemeWrapper.java

…

Display.java

fix the build.

2010-02-26 12:35:55 -08:00

FocusFinder.java

…

FocusFinderHelper.java

…

GestureDetector.java

Recycle MotionEvents properly in GestureDetector

2010-02-18 15:53:59 -08:00

Gravity.java

…

HapticFeedbackConstants.java

Rename tab widget attributes, remove scroll barrier constant.

2010-03-29 14:40:34 -07:00

IApplicationToken.aidl

…

InflateException.java

…

IOnKeyguardExitResult.aidl

…

IRotationWatcher.aidl

…

IWindow.aidl

Work on issue #2263557: PMF3000 showing hybrid of portrait and landscape modes

2010-02-18 15:47:34 -08:00

IWindowManager.aidl

Work on issue #2263557: PMF3000 showing hybrid of portrait and landscape modes

2010-02-18 15:47:34 -08:00

IWindowSession.aidl

Fix issue #2519590: Lock screen stuck in landscape mode

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

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

Add keycodes PageUp and PageDown

2010-04-02 14:39:20 -07:00

LayoutInflater.java

eclair snapshot

2009-11-13 13:53:39 -08:00

Menu.java

…

MenuInflater.java

…

MenuItem.java

…

MotionEvent.aidl

…

MotionEvent.java

Fix MotionEvent pointer API.

2010-02-12 17:52:22 -08:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

RawInputEvent.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

RemotableViewMethod.java

…

ScaleGestureDetector.java

Improvements to ScaleGestureDetector

2010-03-12 10:53:11 -08:00

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

eclair snapshot

2009-11-13 13:53:39 -08:00

SurfaceSession.java

…

SurfaceView.java

Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder

2010-03-31 22:55:26 -07:00

TouchDelegate.java

…

VelocityTracker.java

Fix the build.

2010-03-10 12:40:04 -08:00

View.java

Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.

2010-04-19 15:26:15 -07:00

ViewConfiguration.java

Make paging touch slop smaller

2010-03-11 10:25:24 -08:00

ViewDebug.java

Improve export to bitmap layers for HierarchyViewer.

2010-03-22 18:58:21 -07:00

ViewGroup.java

doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)

2010-04-01 09:16:08 -07:00

ViewManager.java

…

ViewParent.java

…

ViewRoot.java

fix [2615973] ViewRoot locks the Surface even when the dirty region is empty

2010-04-21 18:40:05 -07:00

ViewStub.java

Fix for http://b/issue?id=2323459 and generics correctness on a WeakReference

2009-12-15 11:45:58 -08:00

ViewTreeObserver.java

…

VolumePanel.java

eclair snapshot

2009-11-13 13:53:39 -08:00

Window.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

WindowManager.aidl

…

WindowManager.java

Add more WindowManager flags to ViewDebug.

2010-04-02 16:51:58 -04:00

WindowManagerImpl.java

…

WindowManagerPolicy.java

Further improvements to window management!

2010-03-10 16:47:57 -08:00

WindowOrientationListener.java

Remove upside-down portrait orientation.

2010-03-29 14:43:46 -07:00