Brian Colonna c849fbcf3d resolved conflicts for merge of 5856ee4b to master ...

Change-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7

2013-04-02 17:16:55 -04:00

..

AppTransition.java

Convert three booleans into single state variable.

2013-01-07 23:39:10 -08:00

AppWindowAnimator.java

Start moving Tasks from DisplayContent to TaskStack

2013-03-15 22:44:29 -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

split Surface in two classes: SurfaceControl and Surface

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

DisplayContent.java

Modify StackBox and TaskStack methods.

2013-03-25 09:13:41 -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

Introduce multiple displays with DisplayContent.

2012-08-02 08:47:44 -07:00

InputMonitor.java

Fix issue #6968859: home not exiting an ANR'd dream

2012-10-04 12:04:58 -07:00

KeyguardDisableHandler.java

DevicePolicyManager per user

2012-09-18 14:28:33 -07:00

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

Modify StackBox and TaskStack methods.

2013-03-25 09:13:41 -07:00

StartingData.java

…

StrictModeFlash.java

split Surface in two classes: SurfaceControl and Surface

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

Task.java

Start moving Tasks from DisplayContent to TaskStack

2013-03-15 22:44:29 -07:00

TaskGroup.java

Revert ActivityManager changes for tasks. DO NOT MERGE

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

TaskStack.java

Modify StackBox and TaskStack methods.

2013-03-25 09:13:41 -07:00

ViewServer.java

Make ViewServer more quiet

2011-08-31 14:11:07 -07:00

Watermark.java

split Surface in two classes: SurfaceControl and Surface

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

WindowAnimator.java

Complete removal of Task from DisplayContent.

2013-03-17 16:19:21 -07:00

WindowManagerService.java

resolved conflicts for merge of 5856ee4b to master

2013-04-02 17:16:55 -04:00

WindowState.java

Complete removal of Task from DisplayContent.

2013-03-17 16:19:21 -07:00

WindowStateAnimator.java

clean-up following Surface split

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

WindowToken.java

Revert ActivityManager changes for tasks. DO NOT MERGE

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