Phil Weaver 0784828fb0 resolve merge conflicts of 490d397d28 to oc-dr1-dev ...

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.


Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: Ib00a23ae9a329cfc102b1a116b5a585be36b56f6

2017-08-29 22:56:44 +00:00

..

accessibility

Merge "docs: replaced "i.e." to fix formatting error" into oc-dev

2017-08-11 21:01:15 +00:00

animation

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

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

autofill

Clarifies autofill lifecycle.

2017-08-07 17:22:50 -07:00

inputmethod

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

textclassifier

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

textservice

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

2017-06-06 15:48:24 +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

…

AnimationRenderStats.aidl

…

AppTransitionAnimationSpec.aidl

…

AppTransitionAnimationSpec.java

Updating AnimationSpec and related internal APIs to use GraphicBuffer.

2017-05-31 09:44:15 -07:00

BatchedInputEventReceiver.java

…

Choreographer.java

Properly run window animations at vsync-sf (1/2)

2017-06-08 17:22:43 -07:00

CollapsibleActionView.java

…

ContextMenu.java

…

ContextThemeWrapper.java

API refactor: context.startForegroundService()

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

Display.aidl

…

Display.java

Remove rotation and app bounds from Configuration diff.

2017-07-28 07:49:01 -07:00

DisplayAdjustments.java

…

DisplayEventReceiver.java

Added back removed ctor from DisplayEventReceiver

2017-06-19 13:53:32 -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

…

DragEvent.aidl

…

DragEvent.java

…

FallbackEventHandler.java

…

FocusFinder.java

Gracefully handle focus loops created by app dev.

2017-08-02 17:33:32 +00: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

…

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

…

HapticFeedbackConstants.java

Remove non-safe mode boot vibration.

2017-07-21 19:11:24 +01:00

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

Hide APIs not intended to ship in DR.

2017-06-12 10:26:01 -06:00

InputEvent.aidl

…

InputEvent.java

…

InputEventConsistencyVerifier.java

…

InputEventReceiver.java

Fix keyboard focus in VR

2017-08-02 10:46:22 -07:00

InputEventSender.java

…

InputFilter.java

…

InputQueue.java

…

IOnKeyguardExitResult.aidl

…

IPinnedStackController.aidl

Fix issue with aspect ratio not applying correctly when PIP is expanded

2017-05-30 16:36:48 +00:00

IPinnedStackListener.aidl

Tightening up rotation behavior for PIP (3/3)

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

IRotationWatcher.aidl

…

IWallpaperVisibilityListener.aidl

Scrims should be grey when in-app

2017-06-14 10:00:16 -07:00

IWindow.aidl

Separate global and override config sent to client

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

IWindowFocusObserver.aidl

…

IWindowId.aidl

…

IWindowManager.aidl

Scrims should be grey when in-app

2017-06-14 10:00:16 -07:00

IWindowSession.aidl

Revert "Coordinate configuration changes and window frame size."

2017-06-07 23:03:09 +00:00

IWindowSessionCallback.aidl

…

KeyboardShortcutGroup.java

Expose hidden apis used by CTS as TestApi

2017-05-26 13:09:56 +01:00

KeyboardShortcutInfo.java

…

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

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06: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

Force Autofill in FloatingToolbar overflow menu

2017-06-08 17:16:26 -07:00

MotionEvent.aidl

…

MotionEvent.java

Revive DeadZone

2017-06-19 14:06:21 -07:00

NotificationHeaderView.java

Removing contents hidden string for public notifications

2017-07-20 14:16:13 -07:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

PointerIcon.aidl

…

PointerIcon.java

…

RecordingCanvas.java

…

RemotableViewMethod.java

…

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

…

RoundScrollbarRenderer.java

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

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

ScaleGestureDetector.java

…

SearchEvent.java

…

SoundEffectConstants.java

…

SubMenu.java

…

Surface.java

Remove rotation and app bounds from Configuration diff.

2017-07-28 07:49:01 -07:00

SurfaceControl.java

Add black frame behind app window

2017-08-04 14:32:26 -07: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

Fix incorrect SV calculation in non-RT codepath.

2017-07-18 14:52:52 -07:00

TextureView.java

…

ThreadedRenderer.java

Merge "Add a workaround for simulate secondary display" into oc-dev

2017-06-14 20:27:09 +00:00

TouchDelegate.java

…

VelocityTracker.java

…

View.java

Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev

2017-08-25 21:36:04 +00: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 "Add docs for new padding/margin attributes." into oc-dev

2017-06-30 00:32:26 +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

…

ViewPropertyAnimatorRT.java

…

ViewRootImpl.java

Fix keyboard focus in VR

2017-08-02 10:46:22 -07:00

ViewStructure.java

Overall improvement on Autofill javadocs for autofillable APIs.

2017-06-06 14:33:56 -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

Workaround to ensure that PIP activities have a visible shadow.

2017-06-02 16:02:50 -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

resolve merge conflicts of 490d397d28 to oc-dr1-dev

2017-08-29 22:56:44 +00:00

WindowManagerGlobal.java

Suppress a11y shortcut on emergency dialer

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

WindowManagerImpl.java

Add getCurrentImeTouchRegion to the WindowManager API

2017-06-29 13:44:19 -04:00

WindowManagerInternal.java

Fix keyboard focus in VR

2017-08-02 10:46:22 -07:00

WindowManagerPolicy.java

Fix keyboard focus in VR

2017-08-02 10:46:22 -07:00