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

Merge "Migrate ACTION_AMBIENT_GESTURE from TRON to WW." into rvc-dev

Browse Source
This commit is contained in:
Thiru Ramasamy
2020-05-07 00:14:14 +00:00
committed by Android (Google) Code Review
parent f4e9f99eab cc2a32ffb2
commit 7efdd5d903
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
View File

@@ -41,6 +41,9 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.systemui.plugins.SensorManagerPlugin; import com.android.systemui.plugins.SensorManagerPlugin;
import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.DozeParameters;
@@ -56,8 +59,8 @@ import java.util.function.Consumer;
public class DozeSensors { public class DozeSensors {
private static final boolean DEBUG = DozeService.DEBUG; private static final boolean DEBUG = DozeService.DEBUG;
private static final String TAG = "DozeSensors"; private static final String TAG = "DozeSensors";
private static final UiEventLogger UI_EVENT_LOGGER = new UiEventLoggerImpl();
private final Context mContext; private final Context mContext;
private final AlarmManager mAlarmManager; private final AlarmManager mAlarmManager;
@@ -79,6 +82,23 @@ public class DozeSensors {
private boolean mListening; private boolean mListening;
private boolean mPaused; private boolean mPaused;
@VisibleForTesting
public enum DozeSensorsUiEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "User performs pickup gesture that activates the ambient display")
ACTION_AMBIENT_GESTURE_PICKUP(459);
private final int mId;
DozeSensorsUiEvent(int id) {
mId = id;
}
@Override
public int getId() {
return mId;
}
}
public DozeSensors(Context context, AlarmManager alarmManager, AsyncSensorManager sensorManager, public DozeSensors(Context context, AlarmManager alarmManager, AsyncSensorManager sensorManager,
DozeParameters dozeParameters, AmbientDisplayConfiguration config, WakeLock wakeLock, DozeParameters dozeParameters, AmbientDisplayConfiguration config, WakeLock wakeLock,
Callback callback, Consumer<Boolean> proxCallback, DozeLog dozeLog) { Callback callback, Consumer<Boolean> proxCallback, DozeLog dozeLog) {
@@ -416,6 +436,7 @@ public class DozeSensors {
MetricsLogger.action( MetricsLogger.action(
mContext, MetricsProto.MetricsEvent.ACTION_AMBIENT_GESTURE, mContext, MetricsProto.MetricsEvent.ACTION_AMBIENT_GESTURE,
subType); subType);
UI_EVENT_LOGGER.log(DozeSensorsUiEvent.ACTION_AMBIENT_GESTURE_PICKUP);
} }
mRegistered = false; mRegistered = false;