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

Commit 3ddadd8f authored by Susi Kharraz-Post's avatar Susi Kharraz-Post
Browse files

Rename sharesheet started atom proto fields. 

When copying over the fields into Google3 the linter failed on two field
names that are camel case rather than snake case. Changing here so the
two match. In addition, one of the enum fields didn't have a default
value.

Bug: 147508495
Test: compiles + ChooserActivityTest runs
Change-Id: Iacec9654350763e691a4a10087f693839fd5ea83
parent aec74e1a

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;

        }

    }