Mady Mellor 3b3fd00bf1 resolved conflicts for merge of 1612c73a to master ...

Change-Id: Iffbd707f14fa42c12c35e18ff6826cebd00c7bf8

2015-06-08 11:33:41 -07:00

..

accessibility

resolved conflicts for merge of 1612c73a to master

2015-06-08 11:33:41 -07:00

animation

Remove distance based animation duration API

2015-04-23 18:33:39 -07:00

inputmethod

Report EditorInfo#packageName based on the actual uid.

2015-06-03 15:58:59 -07:00

textservice

Use final in favor of initialization safety.

2015-06-03 04:53:44 +00:00

AbsSavedState.java

…

AccessibilityInteractionController.java

Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev

2015-06-04 02:21:09 +00:00

AccessibilityIterators.java

…

ActionMode.java

Fix ActionMode.snooze API

2015-06-05 03:35:15 +01:00

ActionProvider.java

…

AnimationRenderStats.aidl

…

Choreographer.java

Revert "DO NOT MERGE Backport of limited jank-tracking metrics"

2015-05-13 21:42:28 +00:00

CollapsibleActionView.java

…

ContextMenu.java

Add @ResourceInt annotations on APIs

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

ContextThemeWrapper.java

Allow ContextImpl.setTheme(int) to be called after getTheme()

2015-05-01 11:28:37 -07:00

Display.aidl

DO NOT MERGE - Display mode switches.

2015-05-11 15:02:07 -07:00

Display.java

Add Configuration data for round displays

2015-05-18 14:13:33 -07:00

DisplayAdjustments.java

Adjust activity display metrics based on stack configuration.

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

DisplayEventReceiver.java

Fix leaks due to GC circular references.

2015-04-17 15:24:31 -07:00

DisplayInfo.aidl

…

DisplayInfo.java

Add Configuration data for round displays

2015-05-18 14:13:33 -07:00

DisplayListCanvas.java

Disable density scaling for HW canvas

2015-05-22 10:49:48 -07:00

DragEvent.aidl

…

DragEvent.java

…

FallbackEventHandler.java

…

FocusFinder.java

…

FocusFinderHelper.java

…

FrameInfo.java

Revert "DO NOT MERGE Backport of limited jank-tracking metrics"

2015-05-13 21:42:28 +00:00

FrameStats.java

Remove unused imports in frameworks/base.

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

GestureDetector.java

Change stylus button press to context click in GD - API review feedback

2015-06-05 14:41:22 -07:00

GhostView.java

Don't cause requestLayout when transition changes Visibility.

2015-06-05 17:21:40 -07:00

GraphicBuffer.aidl

…

GraphicBuffer.java

…

Gravity.java

…

HapticFeedbackConstants.java

Change stylus button press to context click in View - API review feedback

2015-06-05 09:02:55 -07:00

HardwareLayer.java

…

HardwareRenderer.java

Adjust light source for window position

2015-05-14 18:05:36 -07:00

IApplicationToken.aidl

…

IAssetAtlas.aidl

…

IGraphicsStats.aidl

Add GraphicsStatsService

2015-03-27 11:50:56 -07:00

IInputFilter.aidl

…

IInputFilterHost.aidl

…

InflateException.java

…

InputChannel.aidl

…

InputChannel.java

…

InputDevice.aidl

…

InputDevice.java

Simplify input-audio device mapping

2015-04-08 15:44:03 -07:00

InputEvent.aidl

…

InputEvent.java

…

InputEventConsistencyVerifier.java

Revert "Revert "Add new MotionEvent actions for button press and release.""

2015-05-14 14:48:08 +01:00

InputEventReceiver.java

…

InputEventSender.java

…

InputFilter.java

…

InputQueue.java

…

IOnKeyguardExitResult.aidl

…

IRotationWatcher.aidl

…

IWindow.aidl

Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

2015-05-27 15:36:10 -07:00

IWindowFocusObserver.aidl

…

IWindowId.aidl

…

IWindowManager.aidl

Add support for disabling display scaling for development.

2015-04-15 19:02:36 -07:00

IWindowSession.aidl

Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

2015-05-27 15:36:10 -07:00

IWindowSessionCallback.aidl

…

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

Remove SLEEP and POWER from wake key list.

2015-04-29 22:32:23 +01:00

LayoutInflater.java

Always force constructors accessible during inflation

2015-05-04 10:32:57 -07:00

MagnificationSpec.aidl

…

MagnificationSpec.java

…

Menu.java

Add @ResourceInt annotations on APIs

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

MenuInflater.java

Always force constructors accessible during inflation

2015-05-04 10:32:57 -07:00

MenuItem.java

MenuItem, navigation and overflow icon tinting

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

MotionEvent.aidl

…

MotionEvent.java

Revert "Revert "Add new MotionEvent actions for button press and release.""

2015-05-14 14:48:08 +01:00

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

PointerIcon.aidl

…

PointerIcon.java

Add @ResourceInt annotations on APIs

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

RemotableViewMethod.java

…

RenderNode.java

Add compat path for restore underflow

2015-04-02 15:30:32 -07:00

RenderNodeAnimator.java

Rename and simplify DisplayList Canvas classes

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

ScaleGestureDetector.java

Stylus scale - API review feedback

2015-06-04 18:03:49 -07:00

SearchEvent.java

Save search context when dispatching onSearchRequested.

2015-04-13 09:39:24 -07:00

SoundEffectConstants.java

…

SubMenu.java

Add @ResourceInt annotations on APIs

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

Surface.aidl

…

Surface.java

Remove HardwareCanvas

2015-03-10 14:56:11 -07:00

SurfaceControl.java

…

SurfaceHolder.java

…

SurfaceSession.java

…

SurfaceView.java

Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

2015-05-27 15:36:10 -07:00

TextureView.java

Fix whitespace in TextureView

2015-05-20 07:21:51 -07:00

ThreadedRenderer.java

Reduce wasted buffer allocations

2015-05-19 15:00:13 -07:00

TouchDelegate.java

…

VelocityTracker.java

…

View.java

Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev

2015-06-08 15:11:32 +00:00

ViewAnimationUtils.java

…

ViewAssistStructure.java

Fix issue #20655182: API Review: ViewAssistStructure

2015-05-07 16:30:52 -07:00

ViewConfiguration.java

Fix ActionMode.snooze API

2015-06-05 03:35:15 +01:00

ViewDebug.java

Improve hierarchy viewer dump hierarchy latency

2015-05-07 18:44:15 -07:00

ViewGroup.java

Fix finding views by accessibility id.

2015-06-03 11:44:47 -07:00

ViewGroupOverlay.java

…

ViewHierarchyEncoder.java

Improve hierarchy viewer dump hierarchy latency

2015-05-07 18:44:15 -07:00

ViewManager.java

…

ViewOutlineProvider.java

…

ViewOverlay.java

…

ViewParent.java

Add a type parameter to startActionMode() calls.

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

ViewPropertyAnimator.java

am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev

2015-05-19 23:15:48 +00:00

ViewPropertyAnimatorRT.java

…

ViewRootImpl.java

Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

2015-06-01 15:42:42 +00:00

ViewStructure.java

Change stylus button press to context click in View - API review feedback

2015-06-05 09:02:55 -07:00

ViewStub.java

Add @ResourceInt annotations on APIs

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

ViewTreeObserver.java

…

Window.java

Remove hidden/deleted APIs.

2015-05-14 14:12:16 -07:00

WindowAnimationFrameStats.aidl

…

WindowAnimationFrameStats.java

…

WindowCallbackWrapper.java

Save search context when dispatching onSearchRequested.

2015-04-13 09:39:24 -07:00

WindowContentFrameStats.aidl

…

WindowContentFrameStats.java

…

WindowId.java

…

WindowInfo.aidl

…

WindowInfo.java

…

WindowInsets.java

Make WindowInsets#hasInsets check for stable insets as well

2015-06-04 12:38:13 -07:00

WindowManager.aidl

…

WindowManager.java

@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.

2015-06-02 11:07:07 -07:00

WindowManagerGlobal.java

Move ApplicationInfo hardware acceleration to public flags

2015-05-27 14:29:20 -07:00

WindowManagerImpl.java

…

WindowManagerInternal.java

Implement nice transitions for light status bar

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

WindowManagerPolicy.java

Prevent windows below the keyguard from showing

2015-06-03 23:44:52 +00:00