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

Merge "Add atoms for accessibility shortcut" into rvc-dev am: 30792c75fb am: 36ee5e55c0

Browse Source 
Change-Id: Icade56e0fabba92e157f7f6c9454fe0d122619b3
This commit is contained in:
Jason Hsu
2020-04-23 03:56:31 +00:00
committed by Automerger Merge Worker
parent 5424c7c785 36ee5e55c0
commit 7c3c4040d2
2 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmds/statsd/src/atoms.proto
View File

@@ -46,6 +46,7 @@ import "frameworks/base/core/proto/android/stats/dnsresolver/dns_resolver.proto"
import "frameworks/base/core/proto/android/stats/devicepolicy/device_policy.proto"; import "frameworks/base/core/proto/android/stats/devicepolicy/device_policy.proto";
import "frameworks/base/core/proto/android/stats/devicepolicy/device_policy_enums.proto"; import "frameworks/base/core/proto/android/stats/devicepolicy/device_policy_enums.proto";
import "frameworks/base/core/proto/android/stats/docsui/docsui_enums.proto"; import "frameworks/base/core/proto/android/stats/docsui/docsui_enums.proto";
import "frameworks/base/core/proto/android/stats/accessibility/accessibility_enums.proto";
import "frameworks/base/core/proto/android/stats/enums.proto"; import "frameworks/base/core/proto/android/stats/enums.proto";
import "frameworks/base/core/proto/android/stats/intelligence/enums.proto"; import "frameworks/base/core/proto/android/stats/intelligence/enums.proto";
import "frameworks/base/core/proto/android/stats/launcher/launcher.proto"; import "frameworks/base/core/proto/android/stats/launcher/launcher.proto";
@@ -423,6 +424,9 @@ message Atom {
PackageInstallerV2Reported package_installer_v2_reported = 263 [(module) = "framework"]; PackageInstallerV2Reported package_installer_v2_reported = 263 [(module) = "framework"];
UserLifecycleJourneyReported user_lifecycle_journey_reported = 264 [(module) = "framework"]; UserLifecycleJourneyReported user_lifecycle_journey_reported = 264 [(module) = "framework"];
UserLifecycleEventOccurred user_lifecycle_event_occurred = 265 [(module) = "framework"]; UserLifecycleEventOccurred user_lifecycle_event_occurred = 265 [(module) = "framework"];
AccessibilityShortcutReported accessibility_shortcut_reported =
266 [(module) = "framework"];
AccessibilityServiceReported accessibility_service_reported = 267 [(module) = "framework"];
SdkExtensionStatus sdk_extension_status = 354; SdkExtensionStatus sdk_extension_status = 354;
// StatsdStats tracks platform atoms with ids upto 500. // StatsdStats tracks platform atoms with ids upto 500.
@@ -9441,3 +9445,38 @@ message UserLifecycleEventOccurred {
} }
optional State state = 4; // Represents the state of an event (beginning/ending) optional State state = 4; // Represents the state of an event (beginning/ending)
} }
/**
* Logs when accessibility shortcut clicked.
*
* Logged from:
* frameworks/base/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
*/
message AccessibilityShortcutReported {
// The accessibility feature(including installed a11y service, framework a11y feature,
// and installed a11y activity) package name that is assigned to the accessibility shortcut.
optional string package_name = 1;
// The definition of the accessibility shortcut.
// From frameworks/base/core/proto/android/stats/accessibility/accessibility_enums.proto.
optional android.stats.accessibility.ShortcutType shortcut_type = 2;
// The definition of the service status.
// From frameworks/base/core/proto/android/stats/accessibility/accessibility_enums.proto.
optional android.stats.accessibility.ServiceStatus service_status = 3;
}
/**
* Logs when accessibility service status changed.
*
* Logged from:
* frameworks/base/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
*/
message AccessibilityServiceReported {
// The accessibility service package name.
optional string package_name = 1;
// The definition of the service status.
// From frameworks/base/core/proto/android/stats/accessibility/accessibility_enums.proto.
optional android.stats.accessibility.ServiceStatus service_status = 2;
}

35
core/proto/android/stats/accessibility/accessibility_enums.proto Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright (C) 2020 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.stats.accessibility;
option java_multiple_files = true;
// The entry point of the accessibility shortcut.
enum ShortcutType {
UNKNOWN_TYPE = 0;
A11Y_BUTTON = 1;
VOLUME_KEY = 2;
TRIPLE_TAP = 3;
A11Y_BUTTON_LONG_PRESS = 4;
}
// The service status code.
enum ServiceStatus {
UNKNOWN = 0;
ENABLED = 1;
DISABLED = 2;
}