2217f61e51ba4b19c56b19297c1e9cf74d7d860f - platform/frameworks/base

commit	2217f61e51ba4b19c56b19297c1e9cf74d7d860f	[log] [tgz]
author	Filip Gruszczynski <gruszczy@google.com>	Tue May 26 11:32:08 2015 -0700
committer	Filip Gruszczynski <gruszczy@google.com>	Wed May 27 15:36:10 2015 -0700
tree	8e6794696b4517c2cc7304b2c4358dea2296fa07
parent	b2849d9a20ac080c1b29a3b54a1d636080faccc3 [diff]

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

This includes the fix for the broken dialog windows. The outsets will
only be calculated and applied if the window is full screen, since
they don't make much sense otherwise.

This reverts commit 4bb6b751fbbb218e8a298db4aa008472a0aa8d31.

Change-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b

core/java/android/service/wallpaper/WallpaperService.java[diff]
core/java/android/view/IWindow.aidl[diff]
core/java/android/view/IWindowSession.aidl[diff]
core/java/android/view/SurfaceView.java[diff]
core/java/android/view/View.java[diff]
core/java/android/view/ViewRootImpl.java[diff]
core/java/android/view/WindowManagerPolicy.java[diff]
core/java/com/android/internal/os/SomeArgs.java[diff]
core/java/com/android/internal/policy/PhoneWindow.java[diff]
core/java/com/android/internal/util/ScreenShapeHelper.java[diff]
core/java/com/android/internal/view/BaseIWindow.java[diff]
core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
services/core/java/com/android/server/policy/PhoneWindowManager.java[diff]
services/core/java/com/android/server/wm/Session.java[diff]
services/core/java/com/android/server/wm/WindowManagerService.java[diff]
services/core/java/com/android/server/wm/WindowState.java[diff]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java[diff]

18 files changed

tree: 8e6794696b4517c2cc7304b2c4358dea2296fa07