Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

accessibility

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

animation

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

autofill

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

contentcapture

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

inputmethod

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

inspector

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

textclassifier

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

textservice

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

AbsSavedState.java

…

AccessibilityEmbeddedConnection.java

…

AccessibilityInteractionController.java

Populate AccessibilityEvent.getAction when preforming an action

2020-04-03 14:23:57 +09:00

AccessibilityIterators.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ActionMode.java

…

ActionProvider.java

…

AnimationRenderStats.aidl

…

AppTransitionAnimationSpec.aidl

…

AppTransitionAnimationSpec.java

…

BatchedInputEventReceiver.java

Allow enabling/disabling batching in BatchedInputEventReceiver

2020-09-08 18:46:08 +00:00

Choreographer.java

Handle DISPLAY_EVENT_FRAME_RATE_OVERRIDE

2020-11-23 20:02:48 +00:00

CollapsibleActionView.java

…

CompositionSamplingListener.java

…

ContentInfo.java

Update ContentInfo.partition to return a Pair instead of a Map

2020-12-02 16:25:43 -08:00

ContextMenu.java

…

ContextThemeWrapper.java

…

CutoutSpecification.java

…

Display.aidl

…

Display.java

Update docs for getAlternativeRefreshRates()

2020-12-01 16:15:48 +01:00

DisplayAddress.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

DisplayAdjustments.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

DisplayCutout.aidl

…

DisplayCutout.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

DisplayEventReceiver.java

Handle DISPLAY_EVENT_FRAME_RATE_OVERRIDE

2020-11-23 20:02:48 +00:00

DisplayInfo.aidl

…

DisplayInfo.java

Handle DISPLAY_EVENT_FRAME_RATE_OVERRIDE

2020-11-23 20:02:48 +00:00

DragAndDropPermissions.java

…

DragEvent.aidl

…

DragEvent.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

EventLogTags.logtags

Add event log for view_enqueue_input_event.

2020-06-15 19:26:38 -07:00

FallbackEventHandler.java

…

FocusFinder.java

Update FocusFinder

2020-07-24 22:03:51 +00:00

FocusFinderHelper.java

…

FrameMetrics.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

FrameMetricsObserver.java

…

FrameStats.java

…

GestureDetector.java

Annotating context in framework base

2020-08-03 11:36:54 +08:00

GestureExclusionTracker.java

…

GhostView.java

Switch Java calls to enableZ and disableZ; remove isRecordingFor

2020-05-06 09:38:39 -04:00

Gravity.java

Add IntDef annotation to gravity field

2020-11-26 15:31:57 +00:00

HandlerActionQueue.java

…

HapticFeedbackConstants.java

…

IApplicationToken.aidl

…

IAppTransitionAnimationSpecsFuture.aidl

…

IDisplayFoldListener.aidl

…

IDisplayWindowInsetsController.aidl

Added systemui controller to control system bars.

2020-07-08 23:06:14 +00:00

IDisplayWindowListener.aidl

Ignores entering PiP animation on seamless rotation

2020-05-20 17:34:17 -07:00

IDisplayWindowRotationCallback.aidl

Move some window related files to android.window package

2020-03-22 09:47:43 -07:00

IDisplayWindowRotationController.aidl

…

IDockedStackListener.aidl

…

IGraphicsStats.aidl

…

IGraphicsStatsCallback.aidl

…

IInputFilter.aidl

…

IInputFilterHost.aidl

…

IInputMonitorHost.aidl

…

ImeFocusController.java

Revert "Revert "Let IME#onFinishInput called without dup onStart..."

2020-12-04 11:40:20 +08:00

ImeInsetsSourceConsumer.java

Measure baseline IMF latency (2/n)

2020-11-03 12:42:54 -08:00

InflateException.java

…

InputApplicationHandle.java

RESTRICT AUTOMERGE Only update native InputApplicationHandle once

2020-12-03 11:57:42 +00:00

InputChannel.aidl

…

InputChannel.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

InputDevice.aidl

…

InputDevice.java

Extract input device vibrators code from VibratorService

2020-11-25 14:35:35 +00:00

InputEvent.aidl

…

InputEvent.java

…

InputEventCompatProcessor.java

…

InputEventConsistencyVerifier.java

…

InputEventReceiver.java

SyncPointerCapture (4/n): Receive capture events in InputEventReceiver

2020-11-17 14:58:46 -08:00

InputEventSender.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

InputFilter.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

InputMonitor.aidl

…

InputMonitor.java

…

InputQueue.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

InputWindowHandle.java

RESTRICT AUTOMERGE Only update native InputApplicationHandle once

2020-12-03 11:57:42 +00:00

InsetsAnimationControlCallbacks.java

IME animation: hide IME-related navbar icons until perceptible

2020-06-22 16:55:54 +02:00

InsetsAnimationControlImpl.java

Log only current client data in IME tracing

2020-11-13 14:30:13 +00:00

InsetsAnimationControlRunner.java

Add proto-based client side dumping for IME tracing

2020-09-29 15:05:18 +02:00

InsetsAnimationThread.java

…

InsetsAnimationThreadControlRunner.java

Don't dispatch legacy insets to client

2020-10-21 20:20:21 +08:00

InsetsController.java

Add extra methods to trigger IME tracing dumps

2020-12-03 13:03:45 +00:00

InsetsFlags.java

Remove redundant logic about System UI visibility

2020-09-28 02:04:21 +08:00

InsetsSource.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

InsetsSourceConsumer.java

Add extra methods to trigger IME tracing dumps

2020-12-03 13:03:45 +00:00

InsetsSourceControl.aidl

…

InsetsSourceControl.java

Add proto-based InputMethodService and server side dumping for IME

2020-10-07 20:27:32 +02:00

InsetsState.aidl

…

InsetsState.java

Remove legacy frames from WindowFrames and DisplayFrames

2020-11-18 10:59:15 +08:00

IOnKeyguardExitResult.aidl

…

IPinnedStackListener.aidl

Cleanup IPinnedStackController and IPinnedStackListener 1/N

2020-12-03 14:33:28 -08:00

IRecentsAnimationController.aidl

Enter PiP directly if the transition is handled in Launcher

2020-10-22 22:36:40 -07:00

IRecentsAnimationRunner.aidl

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IRemoteAnimationFinishedCallback.aidl

…

IRemoteAnimationRunner.aidl

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IRotationWatcher.aidl

…

IScrollCaptureCallbacks.aidl

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

IScrollCaptureConnection.aidl

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

ISystemGestureExclusionListener.aidl

…

IWallpaperVisibilityListener.aidl

…

IWindow.aidl

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

IWindowFocusObserver.aidl

…

IWindowId.aidl

…

IWindowManager.aidl

Introduce WindowContextListenerController

2020-12-04 11:26:57 +08:00

IWindowSession.aidl

Added client requests for ImpressionAttestation

2020-11-24 15:11:17 -08:00

IWindowSessionCallback.aidl

…

KeyboardShortcutGroup.java

…

KeyboardShortcutInfo.java

…

KeyCharacterMap.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

KeyEvent.aidl

Add @JavaOnlyStableParcelable to KeyEvent

2020-10-13 02:25:52 +00:00

KeyEvent.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

LayoutInflater.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

MagnificationSpec.aidl

…

MagnificationSpec.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

Menu.java

…

MenuInflater.java

…

MenuItem.java

…

MotionEvent.aidl

…

MotionEvent.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

NativeVectorDrawableAnimator.java

…

NotificationHeaderView.java

Allow tapping notification icon to expand/contract.

2020-11-20 14:39:45 -05:00

NotificationTopLineView.java

Prioritize ContentTitle over the SubText

2020-11-20 14:39:44 -05:00

OnReceiveContentListener.java

Update ContentInfo.partition to return a Pair instead of a Map

2020-12-02 16:25:43 -08:00

OrientationEventListener.java

…

OrientationListener.java

…

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

package.html

…

PendingInsetsController.java

Let animations of insets controller can be disabled

2020-06-15 19:36:37 +08:00

PointerIcon.aidl

…

PointerIcon.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

RemotableViewMethod.java

…

RemoteAccessibilityController.java

SurfaceView Cleanup (3/n): Extract RemoteAccessibilityController

2020-10-14 19:02:17 +00:00

RemoteAnimationAdapter.aidl

…

RemoteAnimationAdapter.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

RemoteAnimationDefinition.aidl

…

RemoteAnimationDefinition.java

Replace old app transition type to new transition type (1/N)

2020-10-22 19:49:12 +02:00

RemoteAnimationTarget.aidl

…

RemoteAnimationTarget.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

RenderNodeAnimator.java

…

RoundScrollbarRenderer.java

…

ScaleGestureDetector.java

…

ScrollCaptureCallback.java

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

ScrollCaptureConnection.java

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

ScrollCaptureSession.java

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

ScrollCaptureTarget.java

Scroll Capture Framework

2020-04-20 15:07:59 +00:00

ScrollCaptureTargetResolver.java

Refactor names of internal scrollcapture interfaces

2020-10-19 14:48:32 -04:00

SearchEvent.java

…

SoundEffectConstants.java

…

SubMenu.java

…

Surface.java

Add shouldBeSeamless param to Surface.setFrameRate

2020-11-17 11:53:14 +01:00

SurfaceControl.aidl

…

SurfaceControl.java

Add shouldBeSeamless param to Surface.setFrameRate

2020-11-17 11:53:14 +01:00

SurfaceControlViewHost.aidl

…

SurfaceControlViewHost.java

Add focus support for SurfaceControlViewHost

2020-09-15 14:48:13 -07:00

SurfaceHolder.java

…

SurfaceSession.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

SurfaceView.java

Revert "Flip BLAST for SurfaceView"

2020-11-25 19:26:40 +00:00

SyncRtSurfaceTransactionApplier.java

PiP: Move menu to SystemWindow.

2020-10-30 01:47:34 +00:00

TEST_MAPPING

Promote Context related tests to presubmit

2020-11-20 20:11:58 +08:00

TextureView.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ThreadedRenderer.java

Track per-window information in ViewFrameInfo

2020-12-01 15:07:50 -10:00

TouchDelegate.java

…

VelocityTracker.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

VerifiedInputEvent.aidl

…

VerifiedInputEvent.java

Fix broken @see tags in public documentation.

2020-05-01 18:25:32 +00:00

VerifiedKeyEvent.aidl

…

VerifiedKeyEvent.java

Disregard annotation params for stale dataclass detection

2020-11-04 12:40:58 -08:00

VerifiedMotionEvent.aidl

…

VerifiedMotionEvent.java

Disregard annotation params for stale dataclass detection

2020-11-04 12:40:58 -08:00

View.java

Merge "Include touchpad capture in View#requestPointerCapture docs"

2020-12-03 01:15:09 +00:00

ViewAnimationHostBridge.java

…

ViewAnimationUtils.java

…

ViewConfiguration.java

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

2020-12-02 00:38:58 -08:00

ViewDebug.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ViewFrameInfo.java

Track per-window information in ViewFrameInfo

2020-12-01 15:07:50 -10:00

ViewGroup.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ViewGroupOverlay.java

…

ViewHierarchyEncoder.java

…

ViewManager.java

…

ViewOutlineProvider.java

…

ViewOverlay.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ViewParent.java

…

ViewPropertyAnimator.java

Add missing @FloatRange

2020-08-19 11:13:22 -07:00

ViewRootImpl.java

Allow A11yService to customize accessibility focus

2020-12-04 09:55:11 +08:00

ViewRootInsetsControllerHost.java

Don't dispatch legacy insets to client

2020-10-21 20:20:21 +08:00

ViewStructure.java

Suppress all hidden abstract methods in constructable classes.

2020-11-13 02:56:20 +00:00

ViewStub.java

…

ViewTreeObserver.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Window.java

Move activity client operations to a separate interface

2020-12-02 23:14:09 +08:00

WindowAnimationFrameStats.aidl

…

WindowAnimationFrameStats.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

WindowCallbacks.java

…

WindowCallbackWrapper.java

…

WindowContentFrameStats.aidl

…

WindowContentFrameStats.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

WindowId.java

…

WindowInfo.aidl

…

WindowInfo.java

…

WindowInsets.java

Remove legacy frames from WindowFrames and DisplayFrames

2020-11-18 10:59:15 +08:00

WindowInsetsAnimation.java

WindowInsetsAnimationController: Fix minor API issues

2020-03-31 17:48:52 +02:00

WindowInsetsAnimationController.java

Animate IME with zero insets

2020-06-20 03:51:00 +00:00

WindowInsetsAnimationControlListener.java

WindowInsetsAnimationController: Add state callback and getters

2020-03-18 12:17:19 +01:00

WindowInsetsController.java

[RESTRICT AUTOMERGE] docs: Removing obsolee TODO

2020-09-24 18:13:06 +00:00

WindowlessWindowManager.java

Added client requests for ImpressionAttestation

2020-11-24 15:11:17 -08:00

WindowManager.aidl

…

WindowManager.java

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

2020-12-02 00:38:58 -08:00

WindowManagerGlobal.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

WindowManagerImpl.java

Change shouldShowIme -> displayImePolicy

2020-11-25 15:22:51 +00:00

WindowManagerPolicyConstants.java

Keep alternate reference to mStatusBar and mNavigationBar for flexible insets

2020-07-17 08:44:19 -07:00

WindowMetrics.java

Add WindowMetricsHelper

2020-05-04 11:41:13 +08:00