diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-05-30 17:11:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 17:11:19 +0000 |
commit | 2d2e30eeac5b6799808c23b944f29d68ed0c205d (patch) | |
tree | dd030cade95399390628607c8ca7afad0c40b7da /policy | |
parent | 1d285b091bef26cec7e9bedc60f6b549608dc9a0 (diff) | |
parent | 20d94749043d0851f1da10c7749fd7eb13a35081 (diff) | |
download | frameworks_base-2d2e30eeac5b6799808c23b944f29d68ed0c205d.zip frameworks_base-2d2e30eeac5b6799808c23b944f29d68ed0c205d.tar.gz frameworks_base-2d2e30eeac5b6799808c23b944f29d68ed0c205d.tar.bz2 |
Merge "More work on voice interaction visuals." into lmp-preview-dev
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 1aca89a..c483836 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3348,7 +3348,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; |