Andreas Gampe 1109006158 resolved conflicts for merge of 038b8462 to master ...

Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554

2015-03-16 09:45:34 -07:00

..

accessibility

Remove unused imports in frameworks/base.

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

animation

Annotate methods with size and range annotations

2015-03-07 20:49:19 -08:00

inputmethod

Remove unused imports in frameworks/base.

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

textservice

…

AbsSavedState.java

…

AccessibilityInteractionController.java

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

AccessibilityIterators.java

…

ActionMode.java

Add @ResourceInt annotations on APIs

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

ActionProvider.java

…

AnimationRenderStats.aidl

…

Choreographer.java

Initial attempt at jank-tracking stat collection

2015-02-20 08:27:38 -08:00

CollapsibleActionView.java

…

ContextMenu.java

Add @ResourceInt annotations on APIs

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

ContextThemeWrapper.java

Add popup theme for Spinner, use for actionBarPopupTheme default

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

Display.java

Adjust activity display metrics based on stack configuration.

2015-02-13 21:12:47 -08:00

DisplayAdjustments.java

Adjust activity display metrics based on stack configuration.

2015-02-13 21:12:47 -08:00

DisplayEventReceiver.java

…

DisplayInfo.aidl

…

DisplayInfo.java

Adjust activity display metrics based on stack configuration.

2015-02-13 21:12:47 -08:00

DisplayListCanvas.java

Rename and simplify DisplayList Canvas classes

2015-03-09 19:09:55 -07:00

DragEvent.aidl

…

DragEvent.java

…

FallbackEventHandler.java

…

FocusFinder.java

…

FocusFinderHelper.java

…

FrameInfo.java

Initial attempt at jank-tracking stat collection

2015-02-20 08:27:38 -08:00

FrameStats.java

Remove unused imports in frameworks/base.

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

GestureDetector.java

…

GhostView.java

Clear preordered list after use.

2014-09-29 17:10:24 -07:00

GraphicBuffer.aidl

…

GraphicBuffer.java

…

Gravity.java

…

HapticFeedbackConstants.java

…

HardwareCanvas.java

Rename and simplify DisplayList Canvas classes

2015-03-09 19:09:55 -07:00

HardwareLayer.java

resolve merge conflicts of cabf8a7 to master.

2014-11-07 11:29:08 -08:00

HardwareRenderer.java

Rename and simplify DisplayList Canvas classes

2015-03-09 19:09:55 -07:00

IApplicationToken.aidl

…

IAssetAtlas.aidl

…

IInputFilter.aidl

…

IInputFilterHost.aidl

…

InflateException.java

…

InputChannel.aidl

…

InputChannel.java

…

InputDevice.aidl

…

InputDevice.java

…

InputEvent.aidl

…

InputEvent.java

Cancel or drop key events if activity is stopped.

2014-11-12 09:23:22 -08:00

InputEventConsistencyVerifier.java

…

InputEventReceiver.java

…

InputEventSender.java

…

InputFilter.java

…

InputQueue.java

…

IOnKeyguardExitResult.aidl

…

IRotationWatcher.aidl

…

IWindow.aidl

Add enter-animation-done callback for system windows

2014-10-30 14:43:18 -07:00

IWindowFocusObserver.aidl

…

IWindowId.aidl

…

IWindowManager.aidl

Add ClipReveal window transition for application launch

2015-02-13 11:00:55 -08:00

IWindowSession.aidl

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

IWindowSessionCallback.aidl

…

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

Remove unused imports in frameworks/base.

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

LayoutInflater.java

Make TypedArray and LayoutInflater exceptions more useful

2015-03-09 15:32:50 -07:00

MagnificationSpec.aidl

…

MagnificationSpec.java

…

Menu.java

Add @ResourceInt annotations on APIs

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

MenuInflater.java

MenuItem, navigation and overflow icon tinting

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

MenuItem.java

MenuItem, navigation and overflow icon tinting

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

MotionEvent.aidl

…

MotionEvent.java

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

PhoneFallbackEventHandler.java

Split up android.policy into framework.jar and services.jar 1/3

2015-02-10 14:56:02 +01:00

PhoneLayoutInflater.java

Split up android.policy into framework.jar and services.jar 1/3

2015-02-10 14:56:02 +01:00

PhoneWindow.java

Merge "More work on collecting assist data."

2015-03-13 16:41:29 +00:00

PointerIcon.aidl

…

PointerIcon.java

Add @ResourceInt annotations on APIs

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

RemotableViewMethod.java

…

RenderNode.java

Rename and simplify DisplayList Canvas classes

2015-03-09 19:09:55 -07:00

RenderNodeAnimator.java

Rename and simplify DisplayList Canvas classes

2015-03-09 19:09:55 -07:00

ScaleGestureDetector.java

Switch from FloatMath -> Math and Math.hypot where possible

2014-10-01 14:04:15 +01:00

SoundEffectConstants.java

…

SubMenu.java

Add @ResourceInt annotations on APIs

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

Surface.aidl

…

Surface.java

Wire up surface width/height to lockHardwareCanvas DO NOT MERGE

2014-11-24 17:59:38 +00:00

SurfaceControl.java

Use surfaceflinger for recents thumbnail rotations.

2014-09-09 03:15:48 +00:00

SurfaceHolder.java

…

SurfaceSession.java

…

SurfaceView.java

Fix inset hinting when adding window

2014-11-10 17:46:57 +01:00

TextureView.java

…

ThreadedRenderer.java

Cleanups & simplifications

2015-03-11 11:29:13 -07:00

TouchDelegate.java

…

VelocityTracker.java

…

View.java

Merge "More work on collecting assist data."

2015-03-13 16:41:29 +00:00

ViewAnimationUtils.java

Document that circular reveal is async

2014-11-14 14:02:55 -08:00

ViewAssistStructure.java

More work on collecting assist data.

2015-03-12 17:07:51 -07:00

ViewConfiguration.java

Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500"

2015-02-27 12:34:30 -08:00

ViewDebug.java

Fix build

2014-10-17 11:36:38 -07:00

ViewGroup.java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

ViewGroupOverlay.java

…

ViewManager.java

…

ViewOutlineProvider.java

…

ViewOverlay.java

Sync ViewOverlay size init with RenderNode

2014-12-01 17:55:37 -08:00

ViewParent.java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

ViewPropertyAnimator.java

Remove unused imports in frameworks/base.

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

ViewPropertyAnimatorRT.java

…

ViewRootImpl.java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

ViewStub.java

Add @ResourceInt annotations on APIs

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

ViewTreeObserver.java

Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev

2014-11-21 10:13:59 +00:00

Window.java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

WindowAnimationFrameStats.aidl

…

WindowAnimationFrameStats.java

…

WindowCallbackWrapper.java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

WindowContentFrameStats.aidl

…

WindowContentFrameStats.java

…

WindowId.java

…

WindowInfo.aidl

…

WindowInfo.java

…

WindowInsets.java

Fix broken dispatch of onApplyWindowInsets

2014-09-16 23:09:33 +02:00

WindowManager.aidl

…

WindowManager.java

resolved conflicts for merge of 038b8462 to master

2015-03-16 09:45:34 -07:00

WindowManagerGlobal.java

Initial attempt at jank-tracking stat collection

2015-02-20 08:27:38 -08:00

WindowManagerImpl.java

Move default token handling into WindowManagerImpl

2014-11-19 17:02:16 -08:00

WindowManagerInternal.java

Implement nice transitions for light status bar

2015-02-23 13:08:41 +01:00

WindowManagerPolicy.java

Set the light status flag based on right window

2015-02-18 20:09:42 +01:00