diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-30 17:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 17:17:55 +0000 |
| commit | 8b466c19d6306c508aeaa2ad349f8c3225f62f0e (patch) | |
| tree | 761871585770208b1b6f63c96185b0715fe7f1dc /policy | |
| parent | 505b28c105b01f63f0ea4ba702f3ad834c9df3f3 (diff) | |
| parent | 2d2e30eeac5b6799808c23b944f29d68ed0c205d (diff) | |
| download | frameworks_base-8b466c19d6306c508aeaa2ad349f8c3225f62f0e.zip frameworks_base-8b466c19d6306c508aeaa2ad349f8c3225f62f0e.tar.gz frameworks_base-8b466c19d6306c508aeaa2ad349f8c3225f62f0e.tar.bz2 | |
am f6550f0a: Merge "More work on voice interaction visuals." into lmp-preview-dev
* commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4':
More work on voice interaction visuals.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index e1604f4..6bd854a 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3393,7 +3393,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.top = mContentTop; pf.right = mContentRight; pf.bottom = mContentBottom; - if (adjust != SOFT_INPUT_ADJUST_RESIZE) { + if (win.isVoiceInteraction()) { + df.left = of.left = cf.left = mVoiceContentLeft; + df.top = of.top = cf.top = mVoiceContentTop; + df.right = of.right = cf.right = mVoiceContentRight; + df.bottom = of.bottom = cf.bottom = mVoiceContentBottom; + } else if (adjust != SOFT_INPUT_ADJUST_RESIZE) { df.left = of.left = cf.left = mDockLeft; df.top = of.top = cf.top = mDockTop; df.right = of.right = cf.right = mDockRight; |