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

Merge "Update vibration pattern for launching camera" into sc-dev am: 35157ed071 am: 0baf0cee43

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

Change-Id: Ia1174768d88a9ae60cdbd5eaaeafd806da8f31ed
This commit is contained in:
TreeHugger Robot
2021-05-25 12:27:27 +00:00
committed by Automerger Merge Worker
parent 3daf1d3c56 0baf0cee43
commit 3d8e506e59
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -73,6 +73,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.RectF; import android.graphics.RectF;
@@ -326,9 +327,15 @@ public class StatusBar extends SystemUI implements DemoMode,
public static final int FADE_KEYGUARD_DURATION = 300; public static final int FADE_KEYGUARD_DURATION = 300;
public static final int FADE_KEYGUARD_DURATION_PULSING = 96; public static final int FADE_KEYGUARD_DURATION_PULSING = 96;
public static final long[] CAMERA_LAUNCH_GESTURE_VIBRATION_TIMINGS =
new long[]{20, 20, 20, 20, 100, 20};
public static final int[] CAMERA_LAUNCH_GESTURE_VIBRATION_AMPLITUDES =
new int[]{39, 82, 139, 213, 0, 127};
/** If true, the system is in the half-boot-to-decryption-screen state. /**
* Prudently disable QS and notifications. */ * If true, the system is in the half-boot-to-decryption-screen state.
* Prudently disable QS and notifications.
*/
public static final boolean ONLY_CORE_APPS; public static final boolean ONLY_CORE_APPS;
/** If true, the lockscreen will show a distinct wallpaper */ /** If true, the lockscreen will show a distinct wallpaper */
@@ -600,7 +607,7 @@ public class StatusBar extends SystemUI implements DemoMode,
private int mLastCameraLaunchSource; private int mLastCameraLaunchSource;
protected PowerManager.WakeLock mGestureWakeLock; protected PowerManager.WakeLock mGestureWakeLock;
private Vibrator mVibrator; private Vibrator mVibrator;
private long[] mCameraLaunchGestureVibePattern; private VibrationEffect mCameraLaunchGestureVibrationEffect;
private final int[] mTmpInt2 = new int[2]; private final int[] mTmpInt2 = new int[2];
@@ -1311,12 +1318,8 @@ public class StatusBar extends SystemUI implements DemoMode,
mGestureWakeLock = mPowerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, mGestureWakeLock = mPowerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK,
"GestureWakeLock"); "GestureWakeLock");
mVibrator = mContext.getSystemService(Vibrator.class); mVibrator = mContext.getSystemService(Vibrator.class);
int[] pattern = mContext.getResources().getIntArray( mCameraLaunchGestureVibrationEffect = getCameraGestureVibrationEffect(
R.array.config_cameraLaunchGestureVibePattern); mVibrator, context.getResources());
mCameraLaunchGestureVibePattern = new long[pattern.length];
for (int i = 0; i < pattern.length; i++) {
mCameraLaunchGestureVibePattern[i] = pattern[i];
}
// receive broadcasts // receive broadcasts
registerBroadcastReceiver(); registerBroadcastReceiver();
@@ -4062,7 +4065,32 @@ public class StatusBar extends SystemUI implements DemoMode,
private void vibrateForCameraGesture() { private void vibrateForCameraGesture() {
// Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep. // Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep.
mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */); mVibrator.vibrate(mCameraLaunchGestureVibrationEffect);
}
private static VibrationEffect getCameraGestureVibrationEffect(Vibrator vibrator,
Resources resources) {
if (vibrator.areAllPrimitivesSupported(
VibrationEffect.Composition.PRIMITIVE_QUICK_RISE,
VibrationEffect.Composition.PRIMITIVE_CLICK)) {
return VibrationEffect.startComposition()
.addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_RISE)
.addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 1, 50)
.compose();
}
if (vibrator.hasAmplitudeControl()) {
return VibrationEffect.createWaveform(
CAMERA_LAUNCH_GESTURE_VIBRATION_TIMINGS,
CAMERA_LAUNCH_GESTURE_VIBRATION_AMPLITUDES,
/* repeat= */ -1);
}
int[] pattern = resources.getIntArray(R.array.config_cameraLaunchGestureVibePattern);
long[] timings = new long[pattern.length];
for (int i = 0; i < pattern.length; i++) {
timings[i] = pattern[i];
}
return VibrationEffect.createWaveform(timings, /* repeat= */ -1);
} }
/** /**