Craig Mautner 79a64b621e resolved conflicts for merge of a14a14ab to master ...

Change-Id: I80259a2887f36fc3af409322dea36aa90a2ee847

2013-05-08 15:00:09 -07:00

..

AppTransition.java

…

AppWindowAnimator.java

am abe0aa78: am 8f980e1a: Merge "Reduce duration of rotation xfade animation." into jb-mr2-dev

2013-04-10 11:01:28 -07:00

AppWindowToken.java

Revert ActivityManager changes for tasks. DO NOT MERGE

2013-02-25 17:07:39 -08:00

BlackFrame.java

clean-up following Surface split

2013-02-15 12:47:40 -08:00

DimLayer.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

DisplayContent.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

DisplayMagnifier.java

clean-up following Surface split

2013-02-15 12:47:40 -08:00

DisplaySettings.java

Implement display overscan support.

2013-02-19 12:08:58 -08:00

DragState.java

clean-up following Surface split

2013-02-15 12:47:40 -08:00

FakeWindowImpl.java

…

FocusedStackFrame.java

Clean up FocusedStackFrame layer setting.

2013-04-28 08:58:21 -07:00

InputMonitor.java

Incremental repairs to side by side stacks.

2013-04-16 18:55:07 -07:00

KeyguardDisableHandler.java

…

ScreenRotationAnimation.java

Properly close Surface when done.

2013-03-18 10:06:21 -07:00

Session.java

Add new WindowId for cross-process monitoring of focus.

2013-03-05 09:33:48 -08:00

StackBox.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

StackTapDetector.java

Exclude regions from the tap detector.

2013-04-29 10:29:11 -07:00

StartingData.java

…

StrictModeFlash.java

split Surface in two classes: SurfaceControl and Surface

2013-02-14 12:19:11 -08:00

Task.java

Incremental repairs to side by side stacks.

2013-04-16 18:55:07 -07:00

TaskGroup.java

Revert ActivityManager changes for tasks. DO NOT MERGE

2013-02-25 17:07:39 -08:00

TaskStack.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

ViewServer.java

…

Watermark.java

split Surface in two classes: SurfaceControl and Surface

2013-02-14 12:19:11 -08:00

WindowAnimator.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

WindowManagerService.java

Merge "Call ensureActivitiesVisibleLocked from supervisor."

2013-05-06 23:13:12 +00:00

WindowState.java

resolved conflicts for merge of a14a14ab to master

2013-05-08 15:00:09 -07:00

WindowStateAnimator.java

Fix layering and launching issues.

2013-05-03 13:40:13 -07:00

WindowToken.java

Revert ActivityManager changes for tasks. DO NOT MERGE

2013-02-25 17:07:39 -08:00