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

Commit 84f7cf68 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Add blobstore extras to SearchTargetExtras." into tm-qpr-dev am: 8fa43f1d am: b52e55eb 

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



Change-Id: I75849bf46a4f05a178a95a8a36671909920a9e8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a230d03 b52e55eb

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

+21 −3
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ package com.android.app.search; 


import static com.android.app.search.LayoutType.TALL_CARD_WITH_IMAGE_NO_ICON;



import android.app.blob.BlobHandle;

import android.app.search.SearchTarget;

import android.os.Bundle;

import android.text.TextUtils;



import androidx.annotation.Nullable;
@@ -38,17 +40,20 @@ public class SearchTargetExtras { 
    // Indicates the search result app location column

    public static final String BUNDLE_EXTRA_RESULT_APP_GRIDX = "app_gridx";



    // Used for thumbnail loading. Contains handle to retrieve Blobstore asset.

    public static final String BUNDLE_EXTRA_BLOBSTORE_HANDLE = "blobstore_handle_key";



    public static final int GROUPING = 1 << 1;



    @Nullable

    public static String getDecoratorId(@Nullable SearchTarget target) {

        return (target == null || target.getExtras() == null) ? null :

        return isTargetOrExtrasNull(target) ? null :

                target.getExtras().getString(BUNDLE_EXTRA_GROUP_ID);

    }



    public static int getDecoratorType(@Nullable SearchTarget target) {

        int type = 0;

        if (target == null || target.getExtras() == null) {

        if (isTargetOrExtrasNull(target)) {

            return type;

        }

        if (!TextUtils.isEmpty(target.getExtras().getString(BUNDLE_EXTRA_GROUP_ID))) {
@@ -57,6 +62,19 @@ public class SearchTargetExtras { 
        return type;

    }



    /** Whether or not the SearchTarget's Extras contains a blobstore image. */

    public static boolean isSearchTargetBlobstoreAsset(@Nullable SearchTarget target) {

        if (isTargetOrExtrasNull(target)) {

            return false;

        }

        return target.getExtras().getParcelable(

                BUNDLE_EXTRA_BLOBSTORE_HANDLE) instanceof BlobHandle;

    }



    private static boolean isTargetOrExtrasNull(@Nullable SearchTarget target) {

        return target == null || target.getExtras() == null;

    }



    /** Web data related extras and helper methods */

    public static final String BUNDLE_EXTRA_PROXY_WEB_ITEM = "proxy_web_item";

    public static final String BUNDLE_EXTRA_ENTITY = "is_entity";