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

Commit 560144e2 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #5983781: opening a post from status tab... 

...has no cross-activity transition

We apparently no longer want to skip the activity transition when
it is starting from behind the status bar.

Change-Id: I1feb0cf0303f8b89d9089b38b217eac440382059
parent ec046784

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+0 −23
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    WindowState mStatusBar = null;

    boolean mHasSystemNavBar;

    int mStatusBarHeight;

    final ArrayList<WindowState> mStatusBarSubPanels = new ArrayList<WindowState>();

    WindowState mNavigationBar = null;

    boolean mHasNavigationBar = false;

    boolean mCanHideNavigationBar = false;
@@ -1586,7 +1585,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mContext.enforceCallingOrSelfPermission(

                        android.Manifest.permission.STATUS_BAR_SERVICE,

                        "PhoneWindowManager");

                mStatusBarSubPanels.add(win);

                break;

            case TYPE_KEYGUARD:

                if (mKeyguard != null) {
@@ -1606,8 +1604,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            mKeyguard = null;

        } else if (mNavigationBar == win) {

            mNavigationBar = null;

        } else {

            mStatusBarSubPanels.remove(win);

        }

    }
@@ -2778,25 +2774,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            // behind it.

            return false;

        }

        if (mStatusBar != null && mStatusBar.isVisibleLw()) {

            RectF rect = new RectF(mStatusBar.getShownFrameLw());

            for (int i=mStatusBarSubPanels.size()-1; i>=0; i--) {

                WindowState w = mStatusBarSubPanels.get(i);

                if (w.isVisibleLw()) {

                    rect.union(w.getShownFrameLw());

                }

            }

            final int insetw = mRestrictedScreenWidth/10;

            final int inseth = mRestrictedScreenHeight/10;

            if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw,

                        mRestrictedScreenHeight-inseth)) {

                // All of the status bar windows put together cover the

                // screen, so the app can't be seen.  (Note this test doesn't

                // work if the rects of these windows are at odd offsets or

                // sizes, causing gaps in the rect union we have computed.)

                return false;

            }

        }

        return true;

    }