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

Commit 2caff4e8 authored by Alexey Kuzmin's avatar Alexey Kuzmin Committed by android-build-merger
Browse files

Merge "Add fallback for TEXTURE_TICK" into qt-dev 

am: c87a593d

Change-Id: I536ee2cae87549fb688ccf64cb3dbf7624b64ce6
parents ef10b457 c87a593d

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2010,6 +2010,7 @@ package android.os { 
    field public static final int EFFECT_STRENGTH_LIGHT = 0; // 0x0

    field public static final int EFFECT_STRENGTH_MEDIUM = 1; // 0x1

    field public static final int EFFECT_STRENGTH_STRONG = 2; // 0x2

    field public static final int EFFECT_TEXTURE_TICK = 21; // 0x15

    field public static final int EFFECT_THUD = 3; // 0x3

    field public static final int[] RINGTONES;

  }

core/java/android/os/VibrationEffect.java

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public abstract class VibrationEffect implements Parcelable { 
     * @see #get(int)

     * @hide

     */

    @TestApi

    public static final int EFFECT_TEXTURE_TICK = Effect.TEXTURE_TICK;



    /** {@hide} */

services/core/java/com/android/server/VibratorService.java

+4 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ public class VibratorService extends IVibratorService.Stub 
                    case VibrationEffect.EFFECT_CLICK:

                    case VibrationEffect.EFFECT_DOUBLE_CLICK:

                    case VibrationEffect.EFFECT_HEAVY_CLICK:

                    case VibrationEffect.EFFECT_TEXTURE_TICK:

                    case VibrationEffect.EFFECT_TICK:

                    case VibrationEffect.EFFECT_POP:

                    case VibrationEffect.EFFECT_THUD:
@@ -379,6 +380,9 @@ public class VibratorService extends IVibratorService.Stub 
        mFallbackEffects.put(VibrationEffect.EFFECT_TICK, tickEffect);

        mFallbackEffects.put(VibrationEffect.EFFECT_HEAVY_CLICK, heavyClickEffect);



        mFallbackEffects.put(VibrationEffect.EFFECT_TEXTURE_TICK,

                VibrationEffect.get(VibrationEffect.EFFECT_TICK, false));



        mScaleLevels = new SparseArray<>();

        mScaleLevels.put(SCALE_VERY_LOW,

                new ScaleLevel(SCALE_VERY_LOW_GAMMA, SCALE_VERY_LOW_MAX_AMPLITUDE));