Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 714d0434 authored by Susi Kharraz-Post's avatar Susi Kharraz-Post Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ibe864e6a59b447418d7b2e537677e65a84d78f2f
parents 9662e100 1faa9600

cmds/statsd/src/atoms.proto

+3 −2
Original line number Diff line number Diff line
@@ -9249,12 +9249,13 @@ message SharesheetStarted { 
    optional bool is_workprofile = 7;



    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_FILE = 2;  // The preview shown in the sharesheet is a file.

        CONTENT_PREVIEW_TEXT = 3;  // The preview shown in the sharesheet is text.

    }

    // How the sharesheet preview is presented.

    optional SharesheetPreviewType previewType = 8;

    optional SharesheetPreviewType preview_type = 8;



    enum ResolverActivityIntent { // Intents handled by ResolverActivity.java

        INTENT_DEFAULT = 0;
@@ -9267,7 +9268,7 @@ message SharesheetStarted { 
        INTENT_ACTION_MAIN = 7;

    }

    // The intent being processed (only SEND and SEND_MULTIPLE are system sharesheet)

    optional ResolverActivityIntent intentType = 9;

    optional ResolverActivityIntent intent_type = 9;

}



/**

core/java/com/android/internal/app/ChooserActivityLogger.java

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ public interface ChooserActivityLogger { 
                return FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_FILE;

            case ChooserActivity.CONTENT_PREVIEW_TEXT:

            default:

                return FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_TEXT;

                return FrameworkStatsLog

                        .SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_TYPE_UNKNOWN;

        }

    }