Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0925136b authored by Stefan Kuhne's avatar Stefan Kuhne Committed by Android (Google) Code Review
Browse files

Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev

parents 5e275f9f 2f280d06

core/java/android/service/voice/VoiceInteractionSession.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −5
Original line number Diff line number Diff line
@@ -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;