From f7c3903cdaf2af166ffda0f064118f4baddc2d36 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 11 Oct 2018 00:44:39 -0700 Subject: [PATCH] Update SensorManagerPlugin to have vendorType Bug: 111414690 Test: Builds Change-Id: Ice50275160b23bcb60aca1653b570ec9b4565c4e --- .../systemui/plugins/SensorManagerPlugin.java | 18 +++++++++++++++++- .../com/android/systemui/doze/DozeSensors.java | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java index 839b90bf6c5e1..ba4eb5f48528d 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java @@ -67,9 +67,25 @@ public interface SensorManagerPlugin extends Plugin { class TriggerEvent { Sensor mSensor; + int mVendorType; - public TriggerEvent(Sensor sensor) { + /** + * Creates a trigger event + * @param sensor The type of sensor, e.g. TYPE_WAKE_LOCK_SCREEN + * @param vendorType The vendor type, which should be unique for each type of sensor, + * e.g. SINGLE_TAP = 1, DOUBLE_TAP = 2, etc. + */ + public TriggerEvent(Sensor sensor, int vendorType) { mSensor = sensor; + mVendorType = vendorType; + } + + public Sensor getSensor() { + return mSensor; + } + + public int getVendorType() { + return mVendorType; } } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 43dd412f70941..77f7ad4f3a9e6 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -423,7 +423,7 @@ public class DozeSensors { } /** - * A Sensor that is injected via plugin, for better ContextHub interface. + * A Sensor that is injected via plugin. */ private class PluginTriggerSensor extends TriggerSensor {