diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 15:58:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 15:58:03 -0800 |
| commit | 08bb2316f12743fb43d18af94248c5e8caecfa85 (patch) | |
| tree | 615d34830f1848d1953c35f115672433312f734a /tools | |
| parent | 34920823fcd8caff517a32c7aff2c080bfa4835a (diff) | |
| parent | 061b4fae3daf40c90b46e16b12e7f22142eb498c (diff) | |
| download | frameworks_base-08bb2316f12743fb43d18af94248c5e8caecfa85.zip frameworks_base-08bb2316f12743fb43d18af94248c5e8caecfa85.tar.gz frameworks_base-08bb2316f12743fb43d18af94248c5e8caecfa85.tar.bz2 | |
am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
Add mechanism to kick keyguard to show the assistant
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java index fa2cb50..3e625f9 100644 --- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java +++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java @@ -453,6 +453,11 @@ public class IWindowManagerImpl implements IWindowManager { } @Override + public void showAssistant() { + + } + + @Override public IBinder getFocusedWindowToken() { // TODO Auto-generated method stub return null; |