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

Merge "Rename sharesheet started atom proto fields." into rvc-dev am: 1faa960005 am: 6f47791a45

Browse Source 
Change-Id: Idbd4ed2912045d107fd39e69ffb6f80b2c833dd5
This commit is contained in:
Susi Kharraz-Post
2020-04-14 11:18:11 +00:00
committed by Automerger Merge Worker
parent 601d27a2de 6f47791a45
commit 25e9a858c0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9249,12 +9249,13 @@ message SharesheetStarted {
optional bool is_workprofile = 7; optional bool is_workprofile = 7;
enum SharesheetPreviewType { // Constants from ChooserActivity.java enum SharesheetPreviewType { // Constants from ChooserActivity.java
CONTENT_PREVIEW_TYPE_UNKNOWN = 0; // Default for proto 2 / 3 compatibility.
CONTENT_PREVIEW_IMAGE = 1; // The preview shown in the sharesheet is an image. CONTENT_PREVIEW_IMAGE = 1; // The preview shown in the sharesheet is an image.
CONTENT_PREVIEW_FILE = 2; // The preview shown in the sharesheet is a file. CONTENT_PREVIEW_FILE = 2; // The preview shown in the sharesheet is a file.
CONTENT_PREVIEW_TEXT = 3; // The preview shown in the sharesheet is text. CONTENT_PREVIEW_TEXT = 3; // The preview shown in the sharesheet is text.
} }
// How the sharesheet preview is presented. // How the sharesheet preview is presented.
optional SharesheetPreviewType previewType = 8; optional SharesheetPreviewType preview_type = 8;
enum ResolverActivityIntent { // Intents handled by ResolverActivity.java enum ResolverActivityIntent { // Intents handled by ResolverActivity.java
INTENT_DEFAULT = 0; INTENT_DEFAULT = 0;
@@ -9267,7 +9268,7 @@ message SharesheetStarted {
INTENT_ACTION_MAIN = 7; INTENT_ACTION_MAIN = 7;
} }
// The intent being processed (only SEND and SEND_MULTIPLE are system sharesheet) // The intent being processed (only SEND and SEND_MULTIPLE are system sharesheet)
optional ResolverActivityIntent intentType = 9; optional ResolverActivityIntent intent_type = 9;
} }
/** /**

3
core/java/com/android/internal/app/ChooserActivityLogger.java
View File

@@ -182,7 +182,8 @@ public interface ChooserActivityLogger {
return FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_FILE; return FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_FILE;
case ChooserActivity.CONTENT_PREVIEW_TEXT: case ChooserActivity.CONTENT_PREVIEW_TEXT:
default: default:
return FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_TEXT; return FrameworkStatsLog
.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_TYPE_UNKNOWN;
} }
} }