summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2015-08-19 22:13:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-08-19 22:13:07 +0000
commit920d8eb505ff8e7646583b516db07eafb1bc86de (patch)
tree76b11d5b9eaac6691e411d3798c28e3fc50a3d92
parentf86676ad6dc2ba23ad537963a08e10d82d30bf6f (diff)
parentad98eeb16c990b5c48e0a0858f04b847f8099ea6 (diff)
Merge "Fix build."
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 62859ecca9d4..a8fd91c3a607 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -30,6 +30,7 @@ import android.os.IBinder;
import android.os.IRemoteCallback;
import android.os.RemoteException;
import android.util.DisplayMetrics;
+import android.view.AppTransitionAnimationSpec;
import java.lang.Override;
@@ -241,6 +242,12 @@ public class IWindowManagerImpl implements IWindowManager {
}
@Override
+ public void overridePendingAppTransitionMultiThumb(AppTransitionAnimationSpec[] specs,
+ IRemoteCallback callback, boolean scaleUp) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
public void pauseKeyDispatching(IBinder arg0) throws RemoteException {
// TODO Auto-generated method stub