summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-14 19:37:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-14 19:37:21 -0700
commit6917b2a10d9b701282fbfb85be48eeb7e7877882 (patch)
tree0fd56ec04c94ee9202908cdf814ec6ab5d1b2ee8 /tools/layoutlib
parent9a19d16a1a44b8f394f93e116adb48024148f8ef (diff)
parent2da87ec32e72c2c25998e2444155c00074cfbd40 (diff)
downloadframeworks_base-6917b2a10d9b701282fbfb85be48eeb7e7877882.zip
frameworks_base-6917b2a10d9b701282fbfb85be48eeb7e7877882.tar.gz
frameworks_base-6917b2a10d9b701282fbfb85be48eeb7e7877882.tar.bz2
am 2da87ec3: am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2da87ec32e72c2c25998e2444155c00074cfbd40': Implement new window cropping.
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java2
1 files changed, 1 insertions, 1 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 c44ddc6..379fb81 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,7 +47,7 @@ public final class BridgeWindow implements IWindow {
}
@Override
- public void resized(int arg0, int arg1, Rect argBlah, Rect arg2, Rect arg3,
+ public void resized(int arg0, int arg1, Rect arg2, Rect arg3,
boolean arg4, Configuration arg5) throws RemoteException {
// pass for now.
}