diff options
| author | Michael Wright <michaelwr@google.com> | 2018-05-30 02:48:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-30 02:48:14 -0700 |
| commit | 3d3438ff3eef02cd2033a323ca2f6665a39a0929 (patch) | |
| tree | 27e21ca8d1f55cd941e87b80cb99721ccc53bf44 /core/java | |
| parent | 8f2cd87fc03d1d15b76dc6840eda781bcc65b291 (diff) | |
| parent | 4af6ded846270d31905b7cb5191e45867133cdeb (diff) | |
Merge "Allow for any default vibration intensity level." into pi-dev am: fb840c9170
am: 4af6ded846
Change-Id: I436509b14ffc1a100293e36dedbddeceb53c362b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Vibrator.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java index f1f6f414eba8..d2d8f1e159e5 100644 --- a/core/java/android/os/Vibrator.java +++ b/core/java/android/os/Vibrator.java @@ -72,12 +72,23 @@ public abstract class Vibrator { public @interface VibrationIntensity{} private final String mPackageName; + // The default vibration intensity level for haptic feedback. + @VibrationIntensity + private final int mDefaultHapticFeedbackIntensity; + // The default vibration intensity level for notifications. + @VibrationIntensity + private final int mDefaultNotificationVibrationIntensity; /** * @hide to prevent subclassing from outside of the framework */ public Vibrator() { mPackageName = ActivityThread.currentPackageName(); + final Context ctx = ActivityThread.currentActivityThread().getSystemContext(); + mDefaultHapticFeedbackIntensity = loadDefaultIntensity(ctx, + com.android.internal.R.integer.config_defaultHapticFeedbackIntensity); + mDefaultNotificationVibrationIntensity = loadDefaultIntensity(ctx, + com.android.internal.R.integer.config_defaultNotificationVibrationIntensity); } /** @@ -85,6 +96,14 @@ public abstract class Vibrator { */ protected Vibrator(Context context) { mPackageName = context.getOpPackageName(); + mDefaultHapticFeedbackIntensity = loadDefaultIntensity(context, + com.android.internal.R.integer.config_defaultHapticFeedbackIntensity); + mDefaultNotificationVibrationIntensity = loadDefaultIntensity(context, + com.android.internal.R.integer.config_defaultNotificationVibrationIntensity); + } + + private int loadDefaultIntensity(Context ctx, int resId) { + return ctx != null ? ctx.getResources().getInteger(resId) : VIBRATION_INTENSITY_MEDIUM; } /** @@ -92,7 +111,7 @@ public abstract class Vibrator { * @hide */ public int getDefaultHapticFeedbackIntensity() { - return VIBRATION_INTENSITY_MEDIUM; + return mDefaultHapticFeedbackIntensity; } /** @@ -100,7 +119,7 @@ public abstract class Vibrator { * @hide */ public int getDefaultNotificationVibrationIntensity() { - return VIBRATION_INTENSITY_HIGH; + return mDefaultNotificationVibrationIntensity; } /** |