summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-10 10:35:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-10 10:35:19 -0700
commit421dceb0a4fd8f20349a0de277f82b56e71cb90b (patch)
tree092633533796bf65021ee895b1bd7d7a42cb99c2 /tools/layoutlib
parentdc442534070aa8ff4c07cae16fc5207ba6821651 (diff)
parent21385cd83d7d7938b57a4acbaa236dd4c7804ed4 (diff)
downloadframeworks_base-421dceb0a4fd8f20349a0de277f82b56e71cb90b.zip
frameworks_base-421dceb0a4fd8f20349a0de277f82b56e71cb90b.tar.gz
frameworks_base-421dceb0a4fd8f20349a0de277f82b56e71cb90b.tar.bz2
Merge "Making transition out of recents look better" into jb-dev
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
index 85b67d5..a4b2125 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
@@ -240,7 +240,7 @@ public class BridgeWindowManager implements IWindowManager {
@Override
public void overridePendingAppTransitionThumb(Bitmap srcThumb, int startX, int startY,
- IRemoteCallback startedCallback) throws RemoteException {
+ IRemoteCallback startedCallback, boolean delayed) throws RemoteException {
// TODO Auto-generated method stub
}