diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-07 11:53:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 11:53:43 -0700 |
| commit | 337aa27a6307e0f40705ee676551dda4bf6cb894 (patch) | |
| tree | 9d4721514cc14c709cae12073eb1ea1300365682 /tools | |
| parent | fee7ddedc99e377002aa6a88c3e287cb6e6c405d (diff) | |
| parent | 8ee7ac22e6aec5df5405a3e2130d593c50bc39b2 (diff) | |
| download | frameworks_base-337aa27a6307e0f40705ee676551dda4bf6cb894.zip frameworks_base-337aa27a6307e0f40705ee676551dda4bf6cb894.tar.gz frameworks_base-337aa27a6307e0f40705ee676551dda4bf6cb894.tar.bz2 | |
am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
Adds showWhenLocked attribute to Activities.
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 |