Commit 948b7483 authored Apr 30, 2021 by Daniel Sandler Committed by Automerger Merge Worker Apr 30, 2021

Merge "Switch assistant to HEAVY_CLICK effect on devices without haptic...

Merge "Switch assistant to HEAVY_CLICK effect on devices without haptic composition." into sc-dev am: 0da64219

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14387503

Change-Id: I6aa886c3a80e82486ba755705ad8b48e0497e775

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -5153,7 +5153,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		.compose();
		}
		// fallback for devices without composition support
		return VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
		return VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK);

		default:
		return null;