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

Commit 0a384314 authored by Samir Mehta's avatar Samir Mehta
Browse files

Revert "framework/base: Fix touch failure during video and incoming call." 

This reverts commit c39f0095.
As this causes other issues with other heads up windows.

Change-Id: I6c1a4f59fe79336b6aec233da4b9266ea37c0fd0
parent 7c8bca9e

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

+2 −17
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    boolean mSafeMode;

    WindowState mStatusBar = null;

    WindowState mHeadsUp = null;

    int mStatusBarHeight;

    WindowState mNavigationBar = null;

    boolean mHasNavigationBar = false;
@@ -1997,13 +1996,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mContext.enforceCallingOrSelfPermission(

                        android.Manifest.permission.STATUS_BAR_SERVICE,

                        "PhoneWindowManager");

                if (mHeadsUp != null) {

                    if (mHeadsUp.isAlive()) {

                        return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;

                    }

                }

                mHeadsUp = win;

                if (DEBUG) Slog.i(TAG, "HeadsUp Notification: " + mHeadsUp);

                break;

            case TYPE_STATUS_BAR_SUB_PANEL:

                mContext.enforceCallingOrSelfPermission(
@@ -2034,9 +2026,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        } if (mNavigationBar == win) {

            mNavigationBar = null;

            mNavigationBarController.setWindow(null);

        } if (mHeadsUp == win) {

            if (DEBUG) Slog.i(TAG, "Removing HeadsUp notfication: " + mHeadsUp);

            mHeadsUp = null;

        }

    }
@@ -3077,16 +3066,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (!isKeyguardShowing) {

                navTranslucent &= areTranslucentBarsAllowed();

            }

            boolean headsUpVisible = false; // needed for the case when HeadsUpNotification is displayed.

            if(mHeadsUp != null )

                headsUpVisible = mHeadsUp.isVisibleLw();



            // When the navigation bar isn't visible, we put up a fake

            // input window to catch all touch events.  This way we can

            // detect when the user presses anywhere to bring back the nav

            // bar and ensure the application doesn't see the event.

            // Fake window should not be displayed when HeadsUpNotificationView

            // in the form of HighPriority notifications are displayed

            if (navVisible || navAllowedHidden || headsUpVisible) {

            if (navVisible || navAllowedHidden) {

                if (mHideNavFakeWindow != null) {

                    mHideNavFakeWindow.dismiss();

                    mHideNavFakeWindow = null;