summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-14 19:32:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-14 19:32:39 -0700
commit2da87ec32e72c2c25998e2444155c00074cfbd40 (patch)
tree49dd2b0d98e7b0e451c23c15738a5e4cdf0e24c4 /tools/layoutlib
parent58b0dcde83354bd1ae9091a7cbc7f207fb29960a (diff)
parent2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517 (diff)
downloadframeworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.zip
frameworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.tar.gz
frameworks_base-2da87ec32e72c2c25998e2444155c00074cfbd40.tar.bz2
am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517': 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.
}