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

Commit 98ce8a38 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge "Custom haptic composition for assistant launched via button." into sc-dev am: ad4a5023 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021433

Change-Id: I4d0911efdd159ae491d844d08bb17a47e21d036b
parents 852f4bf2 ad4a5023

core/java/android/view/HapticFeedbackConstants.java

+6 −0
Original line number Diff line number Diff line
@@ -128,6 +128,12 @@ public class HapticFeedbackConstants { 
     */

    public static final int SAFE_MODE_ENABLED = 10001;



    /**

     * Invocation of the voice assistant via hardware button.

     * @hide

     */

    public static final int ASSISTANT_BUTTON = 10002;



    /**

     * Flag for {@link View#performHapticFeedback(int, int)

     * View.performHapticFeedback(int, int)}: Ignore the setting in the

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

+13 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                break;

            case LONG_PRESS_POWER_ASSISTANT:

                mPowerKeyHandled = true;

                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,

                performHapticFeedback(HapticFeedbackConstants.ASSISTANT_BUTTON, false,

                        "Power - Long Press - Go To Assistant");

                final int powerKeyDeviceId = Integer.MIN_VALUE;

                launchAssistAction(null, powerKeyDeviceId, eventTime);
@@ -5073,6 +5073,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                pattern = mSafeModeEnabledVibePattern;

                break;



            case HapticFeedbackConstants.ASSISTANT_BUTTON:

                if (mVibrator.areAllPrimitivesSupported(

                        VibrationEffect.Composition.PRIMITIVE_QUICK_RISE)) {

                    // quiet ramp, short pause, then sharp tick

                    return VibrationEffect.startComposition()

                            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_RISE, 0.25f)

                            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 1f, 50)

                            .compose();

                }

                // fallback for devices without composition support

                return VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);



            default:

                return null;

        }