diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-26 11:32:08 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-05-27 15:36:10 -0700 |
| commit | 2217f61e51ba4b19c56b19297c1e9cf74d7d860f (patch) | |
| tree | 8e6794696b4517c2cc7304b2c4358dea2296fa07 /tools/layoutlib | |
| parent | b2849d9a20ac080c1b29a3b54a1d636080faccc3 (diff) | |
| download | frameworks_base-2217f61e51ba4b19c56b19297c1e9cf74d7d860f.zip frameworks_base-2217f61e51ba4b19c56b19297c1e9cf74d7d860f.tar.gz frameworks_base-2217f61e51ba4b19c56b19297c1e9cf74d7d860f.tar.bz2 | |
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
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java index 66092fc..771c3c8 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java @@ -47,8 +47,8 @@ public final class BridgeWindow implements IWindow { } @Override - public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, boolean b, - Configuration configuration) throws RemoteException { + public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, Rect rect6, + boolean b, Configuration configuration) throws RemoteException { // pass for now. } |