Merge "Adding additional atoms for assist gestures." (0abec216) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+36 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import "frameworks/base/core/proto/android/bluetooth/hfp/enums.proto";
		import "frameworks/base/core/proto/android/bluetooth/smp/enums.proto";
		import "frameworks/base/core/proto/android/debug/enums.proto";
		import "frameworks/base/core/proto/android/hardware/biometrics/enums.proto";
		import "frameworks/base/core/proto/android/hardware/sensor/assist/enums.proto";
		import "frameworks/base/core/proto/android/net/networkcapabilities.proto";
		import "frameworks/base/core/proto/android/os/enums.proto";
		import "frameworks/base/core/proto/android/server/connectivity/data_stall_event.proto";
		@@ -241,6 +242,9 @@ message Atom {
		BluetoothSocketConnectionStateChanged bluetooth_socket_connection_state_changed = 171;
		DeviceIdentifierAccessDenied device_identifier_access_denied = 172;
		BubbleDeveloperErrorReported bubble_developer_error_reported = 173;
		AssistGestureStageReported assist_gesture_stage_reported = 174;
		AssistGestureFeedbackReported assist_gesture_feedback_reported = 175;
		AssistGestureProgressReported assist_gesture_progress_reported = 176;
		}

		// Pulled events will start at field 10000.
		@@ -5522,3 +5526,35 @@ message TrainInfo {

		optional TrainExperimentIds train_experiment_id = 2;
		}

		/**
		* Logs the gesture stage changed event.
		*
		* Logged from:
		* frameworks/base/packages/SystemUI/
		*/
		message AssistGestureStageReported {
		optional android.hardware.sensor.assist.AssistGestureStageEnum gesture_stage = 1;
		}

		/**
		* Logs the feedback type.
		*
		* Logged from:
		* frameworks/base/packages/SystemUI/
		*/
		message AssistGestureFeedbackReported {
		// Whether or not the gesture was used.
		optional android.hardware.sensor.assist.AssistGestureFeedbackEnum feedback_type = 1;
		}

		/**
		* Logs the progress.
		*
		* Logged from:
		* frameworks/base/packages/SystemUI/
		*/
		message AssistGestureProgressReported {
		// [0,100] progress for the assist gesture.
		optional int32 progress = 1;
		}

core/proto/android/hardware/sensor/assist/enums.proto

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		syntax = "proto2";
		package android.hardware.sensor.assist;

		option java_outer_classname = "AssistGestureProtoEnums";
		option java_multiple_files = true;

		enum AssistGestureStageEnum {
		ASSIST_GESTURE_STAGE_UNKNOWN = 0;
		ASSIST_GESTURE_STAGE_PROGRESS = 1;
		ASSIST_GESTURE_STAGE_PRIMED = 2;
		ASSIST_GESTURE_STAGE_DETECTED = 3;
		}

		enum AssistGestureFeedbackEnum {
		ASSIST_GESTURE_FEEDBACK_UNKNOWN = 0;
		ASSIST_GESTURE_FEEDBACK_NOT_USED = 1;
		ASSIST_GESTURE_FEEDBACK_USED = 2;
		}
		No newline at end of file