summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-10 11:57:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-10 11:57:33 -0700
commite5c511a1cceffd17b8edb355f2c19a7498a5e229 (patch)
tree16924ebcae93f40adc90e35766b8734e45373adf /tools/layoutlib
parent800421ba616598098278e63fdc0f189a17541c95 (diff)
parentbf1b5fa944158044a595706924b935b5577ec0f0 (diff)
downloadframeworks_base-e5c511a1cceffd17b8edb355f2c19a7498a5e229.zip
frameworks_base-e5c511a1cceffd17b8edb355f2c19a7498a5e229.tar.gz
frameworks_base-e5c511a1cceffd17b8edb355f2c19a7498a5e229.tar.bz2
am bf1b5fa9: am 421dceb0: Merge "Making transition out of recents look better" into jb-dev
* commit 'bf1b5fa944158044a595706924b935b5577ec0f0': Making transition out of recents look better
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
}