Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 55353cfb: am 0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev

Browse Source 
* commit '55353cfbdc70365c3a9cce5700111d4033416aad':
  Fixing voice panel centering issues in landscape on phone
This commit is contained in:
Stefan Kuhne
2015-06-18 20:22:19 +00:00
committed by Android Git Automerger
parent 68f9a206d7 55353cfbdc
commit 6d2f38c3f0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/voice/VoiceInteractionSession.java
View File

@@ -1097,7 +1097,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
WindowManager.LayoutParams.TYPE_VOICE_INTERACTION, Gravity.BOTTOM, true);
mWindow.getWindow().addFlags(
WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
initViews();
mWindow.getWindow().setLayout(MATCH_PARENT, MATCH_PARENT);
mWindow.setToken(mToken);

11
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3739,13 +3739,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
attrs.gravity = Gravity.BOTTOM;
mDockLayer = win.getSurfaceLayer();
} else if (attrs.type == TYPE_VOICE_INTERACTION) {
pf.left = df.left = of.left = cf.left = vf.left = mUnrestrictedScreenLeft;
pf.left = df.left = of.left = mUnrestrictedScreenLeft;
pf.top = df.top = of.top = mUnrestrictedScreenTop;
pf.right = df.right = of.right = cf.right = vf.right = mUnrestrictedScreenLeft
+ mUnrestrictedScreenWidth;
pf.bottom = df.bottom = of.bottom = cf.bottom = mUnrestrictedScreenTop
+ mUnrestrictedScreenHeight;
pf.right = df.right = of.right = mUnrestrictedScreenLeft + mUnrestrictedScreenWidth;
pf.bottom = df.bottom = of.bottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight;
cf.bottom = vf.bottom = mStableBottom;
// Note: In Phone landscape mode, the button bar should also be excluded.
cf.right = vf.right = mStableRight;
cf.left = vf.left = mStableLeft;
cf.top = vf.top = mStableTop;
} else if (win == mStatusBar) {
pf.left = df.left = of.left = mUnrestrictedScreenLeft;