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

Commit 7f500d67 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10078820 from ea924f3d to udc-release 

Change-Id: I3d110832e43ff77f7f9e5815a701fde7c88c1b35
parents 9c9e6f7e ea924f3d

searchuilib/src/com/android/app/search/LayoutType.java

+6 −0
Original line number Diff line number Diff line
@@ -110,4 +110,10 @@ public class LayoutType { 
    // Only available on or above version code 3.

    public static final String RICHANSWER_PLACEHOLDER = "richanswer_placeholder";



    // Play placeholder

    public static final String PLAY_PLACEHOLDER = "play_placeholder";



    // Only available on or above version code 8 (UP1A)

    // This layout is for educard.

    public static final String EDUCARD = "educard";

}

searchuilib/src/com/android/app/search/QueryExtras.java

+3 −0
Original line number Diff line number Diff line
@@ -39,4 +39,7 @@ public class QueryExtras { 


    // Used to know which target is deleted.

    public static final String EXTRAS_BUNDLE_DELETED_TARGET_ID = "deleted_target_id";



    // Contains "educard dismissed" which is used to know if educard is dismissed.

    public static final String EXTRAS_BUNDLE_EDUCARD_DISMISSED = "educard_dismissed";

}

searchuilib/src/com/android/app/search/SearchTargetEventHelper.java

+12 −0
Original line number Diff line number Diff line
@@ -122,4 +122,16 @@ public class SearchTargetEventHelper { 
        return "SESSION_INFO:" + Process.myUserHandle().getIdentifier()

                + ":toast:" + surfaceVisibility;

    }



    /**

     * Generate target id similar to AiAi targetId for logging Educard when educard is dismissed.

     * AiAi target id is of format "resultType:userId:packageName:extraInfo"

     *

     * @return string TargetId for Educard

     * Example of Educard target Id

     * targetId=EDUCARD:0:toast:EDUCARD

     */

    public static String generateEducardTargetIdForLogging() {

        return "EDUCARD" + ":" + Process.myUserHandle().getIdentifier() + ":toast:EDUCARD";

    }

}

searchuilib/src/com/android/app/search/SearchTargetExtras.java

+32 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.text.TextUtils; 


import androidx.annotation.Nullable;



import java.util.Arrays;



/**

 * Helper class that defines key string value for {@link SearchTarget#getExtras()}

 * and also defines helper methods
@@ -68,6 +70,36 @@ public class SearchTargetExtras { 
    // Used to denote this searchTarget is for recent block in 0-state.

    public static final String EXTRAS_RECENT_BLOCK_TARGET = "recent_block_target";



    // Indicates the result source of this SearchTarget.

    public static final String BUNDLE_EXTRA_DATA_DONATED_SOURCE = "data_donated_source";



    public enum ResultSource {

        AIAI_SEARCH_ROOT("aiai_search_root"),

        APPSEARCH_APP_PREVIEW("appsearch_app_preview"),

        APPSEARCH_APP_SRP_PREVIEW("appsearch_app_srp_preview");



        private final String mDataSource;



        ResultSource(String dataSource) {

            mDataSource = dataSource;

        }



        public String getDataSource() {

            return mDataSource;

        }



        public static ResultSource valueOfResultSource(String source)

                throws IllegalArgumentException {

            ResultSource resultSource = Arrays.stream(ResultSource.values())

                    .filter(val -> val.getDataSource().equals(source))

                    .findFirst()

                    .orElseThrow(() -> new IllegalArgumentException(

                            "Unable to resolve source: " + source));



            return resultSource;

        }

    }



    public static final int GROUPING = 1 << 1;



    @Nullable