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

Commit f219dad7 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev

parents 33b5f783 a8fefa54

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.view.ViewGroup; 
import android.view.ViewGroup.LayoutParams;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.accessibility.AccessibilityManager;

import android.view.animation.AnimationUtils;

import android.widget.DateTimeView;

import android.widget.ImageView;
@@ -161,6 +162,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
    final protected SparseArray<UserInfo> mCurrentProfiles = new SparseArray<UserInfo>();



    protected int mLayoutDirection = -1; // invalid

    protected AccessibilityManager mAccessibilityManager;

    private Locale mLocale;

    private float mFontScale;
@@ -442,6 +444,9 @@ public abstract class BaseStatusBar extends SystemUI implements 


        mNotificationData = new NotificationData(this);



        mAccessibilityManager = (AccessibilityManager)

                mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);



        mDreamManager = IDreamManager.Stub.asInterface(

                ServiceManager.checkService(DreamService.DREAM_SERVICE));

        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
@@ -1977,10 +1982,13 @@ public abstract class BaseStatusBar extends SystemUI implements 
        boolean hasTicker = mHeadsUpTicker && !TextUtils.isEmpty(notification.tickerText);

        boolean isAllowed = notification.extras.getInt(Notification.EXTRA_AS_HEADS_UP,

                Notification.HEADS_UP_ALLOWED) != Notification.HEADS_UP_NEVER;

        boolean accessibilityForcesLaunch = isFullscreen

                && mAccessibilityManager.isTouchExplorationEnabled();



        final KeyguardTouchDelegate keyguard = KeyguardTouchDelegate.getInstance(mContext);

        boolean interrupt = (isFullscreen || (isHighPriority && (isNoisy || hasTicker)))

                && isAllowed

                && !accessibilityForcesLaunch

                && mPowerManager.isScreenOn()

                && !keyguard.isShowingAndNotOccluded()

                && !keyguard.isInputRestricted();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+0 −5
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    };



    private long mLastLockToAppLongPress;

    private AccessibilityManager mAccessibilityManager;

    private View.OnLongClickListener mLongPressBackRecentsListener =

            new View.OnLongClickListener() {

        @Override
@@ -3874,10 +3873,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        try {

            boolean sendBackLongPress = false;

            IActivityManager activityManager = ActivityManagerNative.getDefault();

            if (mAccessibilityManager == null) {

                mAccessibilityManager = (AccessibilityManager)

                        mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);

            }

            boolean isAccessiblityEnabled = mAccessibilityManager.isEnabled();

            if (activityManager.isInLockTaskMode() && !isAccessiblityEnabled) {

                long time = System.currentTimeMillis();