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

Commit 055b965a authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Automerger Merge Worker
Browse files

Add EDUCARD and PLAY_PLACEHOLDER to layoutType. am: fb5653a2 am: c0f7d5f3 am: e3fb735b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/22186914



Change-Id: Ic6ee5fec532487d53cac463f73e192f17101cb07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c359e20b e3fb735b

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";

    }

}