summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-08-17 13:03:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-17 13:03:15 -0700
commitd2ae85d41ec1651dd1bf4c33fe31833ba5c5cff5 (patch)
treea13ab2da158404c627977d9316501332cd863dd8 /tools/layoutlib
parentaeca6898041437a7e2ba68c1421b9be90669154d (diff)
parent832cb229cd748505c90f74ae8154fc3557d61a73 (diff)
downloadframeworks_base-d2ae85d41ec1651dd1bf4c33fe31833ba5c5cff5.zip
frameworks_base-d2ae85d41ec1651dd1bf4c33fe31833ba5c5cff5.tar.gz
frameworks_base-d2ae85d41ec1651dd1bf4c33fe31833ba5c5cff5.tar.bz2
Merge "Adding a thumbnail scale down animation" into jb-mr1-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 f548b46..5516339 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
@@ -225,7 +225,7 @@ public class BridgeWindowManager implements IWindowManager {
@Override
public void overridePendingAppTransitionThumb(Bitmap srcThumb, int startX, int startY,
- IRemoteCallback startedCallback, boolean delayed) throws RemoteException {
+ IRemoteCallback startedCallback, boolean scaleUp) throws RemoteException {
// TODO Auto-generated method stub
}