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

Commit 2f280d06 authored by Stefan Kuhne's avatar Stefan Kuhne
Browse files

Fixing voice panel centering issues in landscape on phone 

The new assist panel (long press on home) was not centered in landscape
mode on phones. This was caused by ignoring the stable insets in the
PhoneWindowManager.

bug: 21708971
Change-Id: I97a968a41c2966b09eba496fbe57c840affdf9ec
parent d719215f

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1098,7 +1098,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
                WindowManager.LayoutParams.TYPE_VOICE_INTERACTION, Gravity.BOTTOM, true);

                WindowManager.LayoutParams.TYPE_VOICE_INTERACTION, Gravity.BOTTOM, true);

        mWindow.getWindow().addFlags(

        mWindow.getWindow().addFlags(

                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |

                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |

                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);

                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |

                WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);

        initViews();

        initViews();

        mWindow.getWindow().setLayout(MATCH_PARENT, MATCH_PARENT);

        mWindow.getWindow().setLayout(MATCH_PARENT, MATCH_PARENT);

        mWindow.setToken(mToken);

        mWindow.setToken(mToken);

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -3739,13 +3739,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            attrs.gravity = Gravity.BOTTOM;

            attrs.gravity = Gravity.BOTTOM;

            mDockLayer = win.getSurfaceLayer();

            mDockLayer = win.getSurfaceLayer();

        } else if (attrs.type == TYPE_VOICE_INTERACTION) {

        } 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.top = df.top = of.top = mUnrestrictedScreenTop;

            pf.right = df.right = of.right = cf.right = vf.right = mUnrestrictedScreenLeft

            pf.right = df.right = of.right = mUnrestrictedScreenLeft + mUnrestrictedScreenWidth;

                    + mUnrestrictedScreenWidth;

            pf.bottom = df.bottom = of.bottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight;

            pf.bottom = df.bottom = of.bottom = cf.bottom = mUnrestrictedScreenTop

                    + mUnrestrictedScreenHeight;

            cf.bottom = vf.bottom = mStableBottom;

            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;

            cf.top = vf.top = mStableTop;

        } else if (win == mStatusBar) {

        } else if (win == mStatusBar) {

            pf.left = df.left = of.left = mUnrestrictedScreenLeft;

            pf.left = df.left = of.left = mUnrestrictedScreenLeft;