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

Commit 4d8440af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Block haptic text handle at the policy layer."

parents 57b2d96c cdd6cfb3

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

+14 −5
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    int mShortPressOnSleepBehavior;

    int mShortPressOnWindowBehavior;

    boolean mHasSoftInput = false;

    boolean mHapticTextHandleEnabled;

    boolean mUseTvRouting;

    int mVeryLongPressTimeout;

    boolean mAllowStartActivityForLongPressOnPowerDuringSetup;
@@ -1836,6 +1837,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mAllowStartActivityForLongPressOnPowerDuringSetup = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_allowStartActivityForLongPressOnPowerInSetup);



        mHapticTextHandleEnabled = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_enableHapticTextHandle);



        mUseTvRouting = AudioSystem.getPlatformType(mContext) == AudioSystem.PLATFORM_TELEVISION;



        mHandleVolumeKeysInWM = mContext.getResources().getBoolean(
@@ -5201,8 +5205,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case HapticFeedbackConstants.CLOCK_TICK:

            case HapticFeedbackConstants.CONTEXT_CLICK:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.KEYBOARD_RELEASE:

            case HapticFeedbackConstants.TEXT_HANDLE_MOVE:

                if (!mHapticTextHandleEnabled) {

                    return null;

                }

            case HapticFeedbackConstants.KEYBOARD_RELEASE:

            case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:

            case HapticFeedbackConstants.ENTRY_BUMP:

            case HapticFeedbackConstants.DRAG_CROSSING:
@@ -5367,10 +5374,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                pw.println(mAllowStartActivityForLongPressOnPowerDuringSetup);

        pw.print(prefix);

                pw.print("mHasSoftInput="); pw.print(mHasSoftInput);

                pw.print(" mDismissImeOnBackKeyPressed="); pw.println(mDismissImeOnBackKeyPressed);

                pw.print(" mHapticTextHandleEnabled="); pw.println(mHapticTextHandleEnabled);

        pw.print(prefix);

                pw.print("mDismissImeOnBackKeyPressed="); pw.print(mDismissImeOnBackKeyPressed);

                pw.print(" mIncallPowerBehavior=");

                pw.print(incallPowerBehaviorToString(mIncallPowerBehavior));

                pw.println(incallPowerBehaviorToString(mIncallPowerBehavior));

        pw.print(prefix);

                pw.print("mIncallBackBehavior=");

                pw.print(incallBackBehaviorToString(mIncallBackBehavior));

                pw.print(" mEndcallBehavior=");