diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-07 11:48:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 11:48:50 -0700 |
| commit | 33877e15b8bfc50bd874027689a4794aa93b923d (patch) | |
| tree | f2315456796e88f0623bf4fed1f2a43a49f3696d /tools | |
| parent | 786d10921b2c525ed22b78ec40ae2554eec85912 (diff) | |
| parent | 5962b12bedc4a1d0354816c1cd6b06ba04f6d807 (diff) | |
| download | frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.zip frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.tar.gz frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.tar.bz2 | |
Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java | 3 |
1 files changed, 2 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 9ddaf63..3fcc8ef 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 @@ -79,7 +79,8 @@ public class BridgeWindowManager implements IWindowManager { } @Override - public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, boolean arg4) + public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, boolean arg4, + boolean arg5) throws RemoteException { // TODO Auto-generated method stub |