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

Commit 870b50f4 authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

add bundle key and SearchTargetConverter.java 

added bundle key to SearchTargetExtras()

bug: 262773731
test: manual
Change-Id: Ie07e0d737ced196e2e2d7be557fb1fde47f15c7d
parent be1ad7b3

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

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.app.search;



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

import static com.android.app.search.SearchActionExtras.BUNDLE_EXTRA_HIDE_ICON;

import static com.android.app.search.SearchActionExtras.BUNDLE_EXTRA_HIDE_SUBTITLE;

import static com.android.app.search.SearchTargetExtras.BUNDLE_EXTRA_CLASS;

import static com.android.app.search.SearchTargetExtras.BUNDLE_EXTRA_SUBTITLE_OVERRIDE;

import static com.android.app.search.SearchTargetExtras.BUNDLE_EXTRA_SUPPORT_QUERY_BUILDER;



import android.app.search.SearchAction;

import android.app.search.SearchTarget;

import android.content.pm.ShortcutInfo;

import android.os.Bundle;



public class SearchTargetConverter {

    /**

     * Generate a searchTarget that uses {@link LayoutType#SMALL_ICON_HORIZONTAL_TEXT} from a

     * searchTarget where original layout type may not have been SMALL_ICON_HORIZONTAL_TEXT. Only

     * possible if the given SearchTarget contains a searchAction or shortcutInfo, otherwise the

     * original searchTarget will be returned.

     */

    public static SearchTarget convertLayoutTypeToSmallIconHorizontalText(

            SearchTarget searchTarget) {

        SearchAction searchTargetAction = searchTarget.getSearchAction();

        ShortcutInfo shortcutInfo = searchTarget.getShortcutInfo();

        int resultType = searchTarget.getResultType();

        String subtitle = "";



        Bundle searchTargetBundle = searchTarget.getExtras();

        searchTargetBundle.putString(BUNDLE_EXTRA_CLASS,

                searchTargetBundle.getString(BUNDLE_EXTRA_CLASS));

        searchTargetBundle.putBoolean(BUNDLE_EXTRA_SUPPORT_QUERY_BUILDER, true);

        searchTargetBundle.putBoolean(BUNDLE_EXTRA_HIDE_SUBTITLE, false);

        searchTargetBundle.putString(BUNDLE_EXTRA_SUBTITLE_OVERRIDE, subtitle);

        searchTargetBundle.putBoolean(BUNDLE_EXTRA_HIDE_ICON, false);



        SearchTarget.Builder builder = new SearchTarget.Builder(resultType,

                SMALL_ICON_HORIZONTAL_TEXT, searchTarget.getId())

                .setPackageName(searchTarget.getPackageName())

                .setExtras(searchTargetBundle)

                .setUserHandle(searchTarget.getUserHandle());

        if (searchTargetAction != null) {

            builder.setSearchAction(searchTargetAction);

        } else if (shortcutInfo != null) {

            builder.setShortcutInfo(shortcutInfo);

        } else {

            return searchTarget;

        }

        return builder.build();

    }

}

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

+4 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -42,10 +41,13 @@ public class SearchTargetExtras { 
    public static final String BUNDLE_EXTRA_GROUP_DECORATE_TOGETHER = "decorate_together";

    // Used if slice title should be rendered else where outside of slice (e.g., edit text)

    public static final String BUNDLE_EXTRA_SLICE_TITLE = "slice_title";

    // USed if slice view should be rendered using full height mode.

    // Used if slice view should be rendered using full height mode.

    public static final String BUNDLE_EXTRA_USE_FULL_HEIGHT = "use_full_height";

    public static final String BUNDLE_EXTRA_IS_NON_TAPPABLE = "is_non_tappable";

    public static final String BUNDLE_EXTRA_TITLE_OVERWRITE = "title_overwrite";

    // Used if subtitle view should be overridden to string that is not natively defined by the

    // search target.

    public static final String BUNDLE_EXTRA_SUBTITLE_OVERRIDE = "subtitle_override";



    // Used for logging. Returns whether spelling correction was applied.

    public static final String BUNDLE_EXTRA_IS_QUERY_CORRECTED = "is_query_corrected";