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

Commit d8dc940f authored by Lais Andrade's avatar Lais Andrade
Browse files

Rename CombinedVibrationEffect to CombinedVibration 

The change makes the distinction between VibrationEffect and
CombinedVibratio clearer. The later is a combination of the former with
the extra information about the vibrator ids, allowing effects to be
played in one or more vibrators in parallel or in sequence.

The methods create/start synced where also renamed to parallel (together
with respective builder classes), to indicate they perform one or more
effects in parallel on multiple vibrators. This is also a better match
to the sequential combinations.

This change also deprecates the Context.VIBRATOR_SERVICE in favour of
the new VIBRATOR_MANAGER_SERVICE. The default vibrator can be retrieved
from the manager system service.

Same deprecation applied to InputDevice.getVibrator method.

Fix: 184123900
Test: CombinedVibrationTest
Change-Id: I44d8b225098d35fbf7783254acaf6a78f9fb4505
parent f6e8d813

core/api/current.txt

+11 −11
Original line number Diff line number Diff line
@@ -10669,7 +10669,7 @@ package android.content { 
    field public static final String USB_SERVICE = "usb";

    field public static final String USER_SERVICE = "user";

    field public static final String VIBRATOR_MANAGER_SERVICE = "vibrator_manager";

    field public static final String VIBRATOR_SERVICE = "vibrator";

    field @Deprecated public static final String VIBRATOR_SERVICE = "vibrator";

    field public static final String VPN_MANAGEMENT_SERVICE = "vpn_management";

    field @UiContext public static final String WALLPAPER_SERVICE = "wallpaper";

    field public static final String WIFI_AWARE_SERVICE = "wifiaware";
@@ -30836,16 +30836,16 @@ package android.os { 
    method public void onCancel();

  }













  public abstract class CombinedVibrationEffect implements android.os.Parcelable {













    method @NonNull public static android.os.CombinedVibrationEffect createSynced(@NonNull android.os.VibrationEffect);













  public abstract class CombinedVibration implements android.os.Parcelable {













    method @NonNull public static android.os.CombinedVibration createParallel(@NonNull android.os.VibrationEffect);















    method public int describeContents();













    method @NonNull public static android.os.CombinedVibrationEffect.SyncedCombination startSynced();













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect> CREATOR;













    method @NonNull public static android.os.CombinedVibration.ParallelCombination startParallel();













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibration> CREATOR;















  }



























  public static final class CombinedVibrationEffect.SyncedCombination {













    method @NonNull public android.os.CombinedVibrationEffect.SyncedCombination addVibrator(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect combine();













  public static final class CombinedVibration.ParallelCombination {













    method @NonNull public android.os.CombinedVibration.ParallelCombination addVibrator(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibration combine();















  }





























  public class ConditionVariable {










@@ -32098,8 +32098,8 @@ package android.os {













    method @NonNull public abstract android.os.Vibrator getDefaultVibrator();















    method @NonNull public abstract android.os.Vibrator getVibrator(int);















    method @NonNull public abstract int[] getVibratorIds();













    method @RequiresPermission(android.Manifest.permission.VIBRATE) public final void vibrate(@NonNull android.os.CombinedVibrationEffect);













    method @RequiresPermission(android.Manifest.permission.VIBRATE) public final void vibrate(@NonNull android.os.CombinedVibrationEffect, @Nullable android.os.VibrationAttributes);













    method @RequiresPermission(android.Manifest.permission.VIBRATE) public final void vibrate(@NonNull android.os.CombinedVibration);













    method @RequiresPermission(android.Manifest.permission.VIBRATE) public final void vibrate(@NonNull android.os.CombinedVibration, @Nullable android.os.VibrationAttributes);















  }





























  public class WorkSource implements android.os.Parcelable {










@@ -47139,7 +47139,7 @@ package android.view {













    method @NonNull public android.hardware.SensorManager getSensorManager();















    method public int getSources();















    method public int getVendorId();













    method public android.os.Vibrator getVibrator();













    method @Deprecated public android.os.Vibrator getVibrator();















    method @NonNull public android.os.VibratorManager getVibratorManager();















    method public boolean[] hasKeys(int...);















    method public boolean hasMicrophone();

























core/api/test-current.txt



+15
−15




























Original line number
Diff line number
Diff line








@@ -1597,39 +1597,39 @@ package android.os {













    field public static final int RESOURCES_SDK_INT;















  }





























  public abstract class CombinedVibrationEffect implements android.os.Parcelable {













  public abstract class CombinedVibration implements android.os.Parcelable {















    method public abstract long getDuration();













    method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential();













    method @NonNull public static android.os.CombinedVibration.SequentialCombination startSequential();















  }





























  public static final class CombinedVibrationEffect.Mono extends android.os.CombinedVibrationEffect {













  public static final class CombinedVibration.Mono extends android.os.CombinedVibration {















    method public long getDuration();















    method @NonNull public android.os.VibrationEffect getEffect();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect.Mono> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibration.Mono> CREATOR;















  }





























  public static final class CombinedVibrationEffect.Sequential extends android.os.CombinedVibrationEffect {













  public static final class CombinedVibration.Sequential extends android.os.CombinedVibration {















    method @NonNull public java.util.List<java.lang.Integer> getDelays();















    method public long getDuration();













    method @NonNull public java.util.List<android.os.CombinedVibrationEffect> getEffects();













    method @NonNull public java.util.List<android.os.CombinedVibration> getEffects();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect.Sequential> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibration.Sequential> CREATOR;















  }





























  public static final class CombinedVibrationEffect.SequentialCombination {













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect combine();













  public static final class CombinedVibration.SequentialCombination {













    method @NonNull public android.os.CombinedVibration.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibration.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int);













    method @NonNull public android.os.CombinedVibration.SequentialCombination addNext(@NonNull android.os.CombinedVibration);













    method @NonNull public android.os.CombinedVibration.SequentialCombination addNext(@NonNull android.os.CombinedVibration, int);













    method @NonNull public android.os.CombinedVibration combine();















  }





























  public static final class CombinedVibrationEffect.Stereo extends android.os.CombinedVibrationEffect {













  public static final class CombinedVibration.Stereo extends android.os.CombinedVibration {















    method public long getDuration();















    method @NonNull public android.util.SparseArray<android.os.VibrationEffect> getEffects();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect.Stereo> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibration.Stereo> CREATOR;















  }































  public class DeviceIdleManager {

































core/java/android/content/Context.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -4128,9 +4128,11 @@ public abstract class Context {













     * Use with {@link #getSystemService(String)} to retrieve a {@link android.os.Vibrator} for















     * interacting with the vibration hardware.















     *













     * @deprecated Use {@link android.os.VibratorManager} to retrieve the default system vibrator.















     * @see #getSystemService(String)















     * @see android.os.Vibrator















     */













    @Deprecated















    public static final String VIBRATOR_SERVICE = "vibrator";































    /**

































core/java/android/hardware/input/IInputManager.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ import android.hardware.input.KeyboardLayout;













import android.hardware.input.IInputDevicesChangedListener;















import android.hardware.input.ITabletModeChangedListener;















import android.hardware.input.TouchCalibration;













import android.os.CombinedVibrationEffect;













import android.os.CombinedVibration;















import android.hardware.input.IInputSensorEventListener;















import android.hardware.input.InputSensorInfo;















import android.hardware.lights.Light;










@@ -91,7 +91,7 @@ interface IInputManager {





























    // Input device vibrator control.















    void vibrate(int deviceId, in VibrationEffect effect, IBinder token);













    void vibrateCombined(int deviceId, in CombinedVibrationEffect effect, IBinder token);













    void vibrateCombined(int deviceId, in CombinedVibration vibration, IBinder token);















    void cancelVibrate(int deviceId, IBinder token);















    int[] getVibratorIds(int deviceId);















    boolean isVibrating(int deviceId);

































core/java/android/hardware/input/InputDeviceVibratorManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -19,7 +19,7 @@ package android.hardware.input;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.os.Binder;













import android.os.CombinedVibrationEffect;













import android.os.CombinedVibration;















import android.os.NullVibrator;















import android.os.VibrationAttributes;















import android.os.Vibrator;










@@ -125,7 +125,7 @@ public class InputDeviceVibratorManager extends VibratorManager













    }































    @Override













    public void vibrate(int uid, String opPkg, @NonNull CombinedVibrationEffect effect,













    public void vibrate(int uid, String opPkg, @NonNull CombinedVibration effect,















            String reason, @Nullable VibrationAttributes attributes) {















        mInputManager.vibrate(mDeviceId, effect, mToken);















    }