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

Commit ffc014df authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into... 

Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am: 280acdb8" into oc-dr1-dev-plus-aosp
parents 6955d448 3a55f55f

core/java/android/view/HapticFeedbackConstants.java

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

     */

    public static final int VIRTUAL_KEY_RELEASE = 7;

    public static final int VIRTUAL_KEY_RELEASE = 7;





    /**

     * The user has performed a selection/insertion handle move on text field.

     * @hide

     */

    public static final int TEXT_HANDLE_MOVE = 8;



    /**

    /**

     * This is a private constant.  Feel free to renumber as desired.

     * This is a private constant.  Feel free to renumber as desired.

     * @hide

     * @hide

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -7713,6 +7713,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:

            case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.TEXT_HANDLE_MOVE:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            default:

            default:

                return null;

                return null;

        }

        }