Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39

2017-05-29 11:10:28 +02:00

..

accessibility

Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev am: ed83139842

2017-05-22 13:27:17 +00:00

animation

Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9

2017-01-26 04:49:33 +00:00

autofill

Moar Autofill Framework javadoc improvements:

2017-05-25 16:10:08 -07:00

inputmethod

fix KeyEvent can't correctly finish when inputmethod time out happend

2017-04-20 15:22:13 +01:00

textclassifier

Make TextClassifier.getLinks(...) a default method.

2017-05-23 21:29:39 +01:00

textservice

SpellCheckerSession: Fix brittle finalizer pattern.

2017-04-26 14:36:26 +00:00

AbsSavedState.java

…

AccessibilityInteractionController.java

Add API for apps to prepare for some a11y requests

2017-03-24 10:15:50 -07:00

AccessibilityIterators.java

Separate global and override config sent to client

2017-03-16 19:13:02 -07:00

ActionMode.java

…

ActionProvider.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

AnimationRenderStats.aidl

…

AppTransitionAnimationSpec.aidl

…

AppTransitionAnimationSpec.java

…

BatchedInputEventReceiver.java

…

Choreographer.java

Schedule window animations at vsync-sf

2017-04-03 15:27:16 +02:00

CollapsibleActionView.java

…

ContextMenu.java

…

ContextThemeWrapper.java

API refactor: context.startForegroundService()

2017-03-30 18:31:24 +00:00

Display.aidl

…

Display.java

Hide flag SHOW_WITH_INSECURE_KEYGUARD

2017-04-13 11:35:40 -07:00

DisplayAdjustments.java

Make usage of Configuration.EMPTY safe

2016-10-14 11:00:13 -07:00

DisplayEventReceiver.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

DisplayInfo.aidl

…

DisplayInfo.java

Add app bounds to configuration.

2017-03-31 21:34:30 -07:00

DisplayListCanvas.java

CriticalNative for RenderNode and DisplayListCanvas

2016-12-15 11:30:08 -08:00

DragAndDropPermissions.java

Revoke drag and drop related grants on client crash

2016-07-21 15:25:12 -07:00

DragEvent.aidl

…

DragEvent.java

More fixes in drag/drop docs.

2016-09-30 16:47:07 -07:00

FallbackEventHandler.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

FocusFinder.java

Don't focus search user-specified views which are invisible

2017-05-01 16:36:24 -07:00

FocusFinderHelper.java

…

FrameInfo.java

…

FrameMetrics.java

Added VSYNC and INTENDED_VSYNC timestamps to FrameMetrics API.

2017-02-22 09:49:32 -08:00

FrameMetricsObserver.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

FrameStats.java

…

GestureDetector.java

Disable touch slop for generated gesture events

2017-02-01 11:06:44 -08:00

GhostView.java

…

Gravity.java

…

HandlerActionQueue.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

HapticFeedbackConstants.java

…

HardwareLayer.java

DeferredLayerUpdater: clean up Layer lifecycle

2017-02-13 14:41:20 -08:00

IApplicationToken.aidl

Support for WindowContainer controllers and listeners

2017-01-06 09:11:02 -08:00

IAppTransitionAnimationSpecsFuture.aidl

…

IDockedStackListener.aidl

Splitscreen for minimized state that works with resizable launchers

2017-01-26 10:31:50 -08:00

IGraphicsStats.aidl

Overhaul GraphicsStatsService

2017-02-21 09:49:10 -08:00

IGraphicsStatsCallback.aidl

Overhaul GraphicsStatsService

2017-02-21 09:49:10 -08:00

IInputFilter.aidl

…

IInputFilterHost.aidl

…

InflateException.java

…

InputChannel.aidl

…

InputChannel.java

…

InputDevice.aidl

…

InputDevice.java

Adding feature: input device disable/enable.

2017-05-01 11:52:13 -07:00

InputEvent.aidl

…

InputEvent.java

…

InputEventConsistencyVerifier.java

…

InputEventReceiver.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

InputEventSender.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

InputFilter.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

InputQueue.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

IOnKeyguardExitResult.aidl

…

IPinnedStackController.aidl

Tightening up rotation behavior for PIP (3/3)

2017-04-17 14:49:31 -07:00

IPinnedStackListener.aidl

Tightening up rotation behavior for PIP (3/3)

2017-04-17 14:49:31 -07:00

IRotationWatcher.aidl

…

IWindow.aidl

Separate global and override config sent to client

2017-03-16 19:13:02 -07:00

IWindowFocusObserver.aidl

…

IWindowId.aidl

…

IWindowManager.aidl

Ensure we show the PiP menu in response to KEYCODE_WINDOW.

2017-03-31 10:42:53 -07:00

IWindowSession.aidl

Separate global and override config sent to client

2017-03-16 19:13:02 -07:00

IWindowSessionCallback.aidl

…

KeyboardShortcutGroup.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

KeyboardShortcutInfo.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

KeyCharacterMap.java

Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9

2017-01-26 04:49:33 +00:00

KeyEvent.aidl

…

KeyEvent.java

Document Android Wear usage of KEYCODE_WINDOW. am: 03d4a65865

2017-04-06 14:19:58 +00:00

LayoutInflater.java

Fix the status icon colors in QS

2017-05-12 16:16:39 -04:00

MagnificationSpec.aidl

…

MagnificationSpec.java

…

Menu.java

Extend MenuItem to allow modifier keys for shortcut

2017-02-07 17:01:26 +00:00

MenuInflater.java

Add support for tinting icon menus

2017-03-22 11:05:49 -04:00

MenuItem.java

Add support for tinting icon menus

2017-03-22 11:05:49 -04:00

MotionEvent.aidl

…

MotionEvent.java

Revert "Re-hide AXIS_SCROLL constant."

2017-02-16 00:59:16 +00:00

NotificationHeaderView.java

Modifications to allow notification header to be customized.

2017-04-20 17:14:13 -07:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

PointerIcon.aidl

…

PointerIcon.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

RecordingCanvas.java

The bigger update to Canvas

2016-10-17 11:33:28 -07:00

RemotableViewMethod.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

RenderNode.java

Overhaul RenderNode's DisplayList management

2017-01-25 12:24:40 -08:00

RenderNodeAnimator.java

Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator

2017-01-06 16:18:31 -08:00

RenderNodeAnimatorSetHelper.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

RoundScrollbarRenderer.java

Update colors for the round scroll bar. am: 5177264735 am: c78b695126

2016-10-31 12:05:28 +00:00

ScaleGestureDetector.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

SearchEvent.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

SoundEffectConstants.java

Document exception thrown in SoundEffectConstants

2016-08-12 13:12:23 -04:00

SubMenu.java

…

Surface.java

Reenable task snapshots without using RenderThread in SystemServer.

2017-03-09 17:47:34 -08:00

SurfaceControl.java

Propagate UIDs for all SurfaceControl instances

2017-05-10 20:13:09 -04:00

SurfaceHolder.java

Provide non-blocking SurfaceView draw notification path.

2017-01-09 10:44:58 -08:00

SurfaceSession.java

Modify SurfaceView to use SurfaceFlinger child surfaces.

2017-03-08 17:36:10 -08:00

SurfaceView.java

Merge "SurfaceView: Wait to gather transparent region." into oc-dev

2017-05-23 16:31:02 +00:00

TextureView.java

docs: fix grammar mistake in TextureView am: e8691d19cb am: 4ff96480b3

2016-09-07 23:42:42 +00:00

ThreadedRenderer.java

Merge "Creating HW bitmaps from RenderNode" into oc-dev am: d63b77c627

2017-05-25 19:09:23 +00:00

TouchDelegate.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

VelocityTracker.java

…

View.java

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

ViewAnimationUtils.java

…

ViewConfiguration.java

Revert "Make scrollbarSize in Material Design theme configurable"

2017-04-12 11:16:51 -07:00

ViewDebug.java

Mark @ symbols in code snippet as literal so javadoc doesn't choke on

2017-03-07 00:33:20 +00:00

ViewGroup.java

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am: 68311f8712

2017-05-25 23:43:20 +00:00

ViewGroupOverlay.java

…

ViewHierarchyEncoder.java

…

ViewManager.java

…

ViewOutlineProvider.java

…

ViewOverlay.java

Fix ViewOverlay#onDescendantInvalidated

2017-04-25 13:32:19 -07:00

ViewParent.java

Add null check to a11y call.

2017-05-12 10:40:53 -07:00

ViewPropertyAnimator.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

ViewPropertyAnimatorRT.java

…

ViewRootImpl.java

Preserve order of a11y events

2017-05-22 14:16:47 -07:00

ViewStructure.java

Removed deprecated setAutofill() method for virtual children.

2017-05-25 11:51:50 -07:00

ViewStub.java

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

ViewTreeObserver.java

Unbreak even more APK 26 apps running on "O" preview/beta builds.

2017-05-17 17:53:38 -06:00

Window.java

No need to deal with windowTokens

2017-05-08 14:02:58 -07:00

WindowAnimationFrameStats.aidl

…

WindowAnimationFrameStats.java

…

WindowCallbacks.java

…

WindowCallbackWrapper.java

No need to deal with windowTokens

2017-05-08 14:02:58 -07:00

WindowContentFrameStats.aidl

…

WindowContentFrameStats.java

…

WindowId.java

…

WindowInfo.aidl

…

WindowInfo.java

Basic accessibility support for picture-in-picture

2017-03-10 15:35:30 -08:00

WindowInsets.java

…

WindowManager.aidl

Handle content insets for snapshots

2017-01-12 16:28:19 +01:00

WindowManager.java

Propagate UIDs for all SurfaceControl instances

2017-05-10 20:13:09 -04:00

WindowManagerGlobal.java

Suppress a11y shortcut on emergency dialer

2017-02-14 16:51:55 -08:00

WindowManagerImpl.java

Fix import statement in view|transition|animation packages.

2016-10-12 09:09:52 -07:00

WindowManagerInternal.java

A new power button mode to hide the IME when shown

2017-04-17 23:22:56 +00:00

WindowManagerPolicy.java

Fix window affecting SysUi visibility for once and all

2017-05-23 16:59:58 +02:00