diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 15:47:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 15:47:04 -0800 |
| commit | 061b4fae3daf40c90b46e16b12e7f22142eb498c (patch) | |
| tree | 152e92dd48a0043fae26e6bc18e524f847f3d617 /tools | |
| parent | 70eeec5c06db3bf38e94d95a284d393e79bf87a0 (diff) | |
| parent | a2bf6181dfca0f93461fc041f2bd2444551a4515 (diff) | |
| download | frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.zip frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.tar.gz frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.tar.bz2 | |
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
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; |