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

Commit 68fede37 authored by Viesturs Zarins's avatar Viesturs Zarins Committed by Automerger Merge Worker
Browse files

Merge "Add searchable metadata attribute for injected tiles." into udc-qpr-dev am: 5bc1e9b3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24792152



Change-Id: Ib3583d5f3a5b7f1086936d848ca41d7921fbded7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3150920 5bc1e9b3

src/com/android/settings/search/SettingsSearchIndexablesProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { 
            // Skip Settings injected items because they should be indexed in the sub-pages.

            return false;

        }

        return true;

        return tile.isSearchable();

    }



    private static Object[] createIndexableRawColumnObjects(SearchIndexableRaw raw) {

tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java

+14 −0
Original line number Diff line number Diff line 
package com.android.settings.search;



import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SEARCHABLE;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE;



import static com.google.common.truth.Truth.assertThat;
@@ -207,6 +208,19 @@ public class SettingsSearchIndexablesProviderTest { 
        assertThat(mProvider.isEligibleForIndexing(PACKAGE_NAME, activityTile)).isTrue();

    }



    @Test

    public void isEligibleForIndexing_disabledByMetadata_shouldReturnFalse() {

        final ActivityInfo activityInfo = new ActivityInfo();

        activityInfo.packageName = PACKAGE_NAME;

        activityInfo.name = "class";

        activityInfo.metaData = new Bundle();

        activityInfo.metaData.putBoolean(META_DATA_PREFERENCE_SEARCHABLE, false);

        final ActivityTile activityTile = new ActivityTile(activityInfo,

                CategoryKey.CATEGORY_CONNECT);



        assertThat(mProvider.isEligibleForIndexing(PACKAGE_NAME, activityTile)).isFalse();

    }



    @Implements(CategoryManager.class)

    public static class ShadowCategoryManager {