Chad Jones 1fb5528643 resolved conflicts for merge of 57bb5f5c to master ...

Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c

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

..

accessibility

am 04057e5d: am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9

2015-02-13 03:57:05 +00:00

animation

Add @ResourceInt annotations on APIs

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

inputmethod

Normalize deprecated 2-letter language code when necessary.

2015-02-21 02:26:40 +09:00

textservice

Fix broken locale related assumptions in TextServicesManager.

2014-07-18 15:02:34 +01:00

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

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

Update FrameStats API per api-council request.

2014-09-05 10:07:02 -07:00

GestureDetector.java

…

GhostView.java

Clear preordered list after use.

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

GLES20Canvas.java

Make DisplayListRenderer inherit from Canvas, merge JNI

2015-01-05 15:25:41 -08:00

GLES20RecordingCanvas.java

Make DisplayListRenderer inherit from Canvas, merge JNI

2015-01-05 15:25:41 -08:00

GraphicBuffer.aidl

…

GraphicBuffer.java

…

Gravity.java

…

HapticFeedbackConstants.java

Update DatePicker widget and its related dialog

2014-07-15 20:26:21 +00:00

HardwareCanvas.java

Make DisplayListRenderer inherit from Canvas, merge JNI

2015-01-05 15:25:41 -08:00

HardwareLayer.java

resolve merge conflicts of cabf8a7 to master.

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

HardwareRenderer.java

Initial attempt at jank-tracking stat collection

2015-02-20 08:27:38 -08: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

Improvements to low power mode.

2014-06-06 10:25:36 -07:00

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

Cancel or drop key events if activity is stopped.

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

LayoutInflater.java

Add @ResourceInt annotations on APIs

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

MagnificationSpec.aidl

…

MagnificationSpec.java

…

Menu.java

Add @ResourceInt annotations on APIs

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

MenuInflater.java

Add @ResourceInt annotations on APIs

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

MenuItem.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08: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 "Floating toolbars: Encapsulate StandaloneActionMode view creation."

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

PointerIcon.aidl

…

PointerIcon.java

Add @ResourceInt annotations on APIs

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

RemotableViewMethod.java

…

RenderNode.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

RenderNodeAnimator.java

Fix issue with RNA destruction mid-animation

2014-12-09 12:35:12 -08: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

More cleanups

2014-06-27 22:34:16 +00:00

ThreadedRenderer.java

Initial attempt at jank-tracking stat collection

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

TouchDelegate.java

…

VelocityTracker.java

…

View.java

Use ObjectAnimator for fading scrollbars, set initial duration to 1500

2015-02-20 11:10:22 -08:00

ViewAnimationUtils.java

Document that circular reveal is async

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

ViewAssistData.java

First quick implementation of auto assist data.

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

ViewConfiguration.java

Use ObjectAnimator for fading scrollbars, set initial duration to 1500

2015-02-20 11:10:22 -08:00

ViewDebug.java

Fix build

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

ViewGroup.java

Add @ResourceInt annotations on APIs

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

ViewGroupOverlay.java

…

ViewManager.java

…

ViewOutlineProvider.java

Add outlineProvider attribute

2014-08-19 18:04:14 -07:00

ViewOverlay.java

Sync ViewOverlay size init with RenderNode

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

ViewParent.java

Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout

2015-01-07 17:00:12 -08:00

ViewPropertyAnimator.java

Canceling ViewPropertyAnimator now removes pending actions

2014-08-28 07:53:59 -07:00

ViewPropertyAnimatorRT.java

Run RevealAnimator on RT

2014-08-19 16:32:43 -07:00

ViewRootImpl.java

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08: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 @ResourceInt annotations on APIs

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

WindowAnimationFrameStats.aidl

…

WindowAnimationFrameStats.java

…

WindowCallbackWrapper.java

Fix a bug propagating navigation button events from ToolbarActionBar

2014-08-18 15:58:23 -07:00

WindowContentFrameStats.aidl

…

WindowContentFrameStats.java

…

WindowId.java

…

WindowInfo.aidl

…

WindowInfo.java

Fix backwards compatibility for introspected windows.

2014-06-12 12:11:39 -07:00

WindowInsets.java

Fix broken dispatch of onApplyWindowInsets

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

WindowManager.aidl

…

WindowManager.java

am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter.

2015-02-06 20:20:47 +00: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