Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2021-04-01 15:41:57 +00:00
committed by Android (Google) Code Review
parent 3c942191cb 8ff8bd327c
commit ad4a5023ce
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/HapticFeedbackConstants.java
View File

@@ -128,6 +128,12 @@ public class HapticFeedbackConstants {
*/ */
public static final int SAFE_MODE_ENABLED = 10001; 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) * Flag for {@link View#performHapticFeedback(int, int)
* View.performHapticFeedback(int, int)}: Ignore the setting in the * View.performHapticFeedback(int, int)}: Ignore the setting in the

14
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1092,7 +1092,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
break; break;
case LONG_PRESS_POWER_ASSISTANT: case LONG_PRESS_POWER_ASSISTANT:
mPowerKeyHandled = true; mPowerKeyHandled = true;
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false, performHapticFeedback(HapticFeedbackConstants.ASSISTANT_BUTTON, false,
"Power - Long Press - Go To Assistant"); "Power - Long Press - Go To Assistant");
final int powerKeyDeviceId = Integer.MIN_VALUE; final int powerKeyDeviceId = Integer.MIN_VALUE;
launchAssistAction(null, powerKeyDeviceId, eventTime); launchAssistAction(null, powerKeyDeviceId, eventTime);
@@ -5073,6 +5073,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
pattern = mSafeModeEnabledVibePattern; pattern = mSafeModeEnabledVibePattern;
break; 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: default:
return null; return null;
} }