summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-08-02 09:20:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-02 09:20:14 -0700
commit437a0fbd57662e1d9d260da6f62ff83da2769a7e (patch)
tree7df1f02b3bcc2d3fc4e22926e55c33e712879419 /tools/layoutlib
parenta7ce1551a6c05d4f983e283b413cadb1ddc1026d (diff)
parent59c009776dae5ccbdfb93d7151ff2065ca049dc3 (diff)
downloadframeworks_base-437a0fbd57662e1d9d260da6f62ff83da2769a7e.zip
frameworks_base-437a0fbd57662e1d9d260da6f62ff83da2769a7e.tar.gz
frameworks_base-437a0fbd57662e1d9d260da6f62ff83da2769a7e.tar.bz2
Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java7
1 files changed, 4 insertions, 3 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 2619dd8..67e51fa 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
@@ -92,7 +92,7 @@ public class BridgeWindowManager implements IWindowManager {
}
@Override
- public void clearForcedDisplaySize() throws RemoteException {
+ public void clearForcedDisplaySize(int displayId) throws RemoteException {
// TODO Auto-generated method stub
}
@@ -262,7 +262,8 @@ public class BridgeWindowManager implements IWindowManager {
}
@Override
- public Bitmap screenshotApplications(IBinder arg0, int arg1, int arg2) throws RemoteException {
+ public Bitmap screenshotApplications(IBinder arg0, int displayId, int arg1, int arg2)
+ throws RemoteException {
// TODO Auto-generated method stub
return null;
}
@@ -324,7 +325,7 @@ public class BridgeWindowManager implements IWindowManager {
}
@Override
- public void setForcedDisplaySize(int arg0, int arg1) throws RemoteException {
+ public void setForcedDisplaySize(int displayId, int arg0, int arg1) throws RemoteException {
// TODO Auto-generated method stub
}