From dbcdb95daa62fb91d12458c992895f9af11f28a6 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Thu, 28 Mar 2019 21:22:35 +0800 Subject: [PATCH] Implement slices api of SettingsSearchIndexablesProvider add querySliceUriPairs method to provider Fixes: 129322803 Test: manual and robotests Change-Id: I9255ed6dba5b8b1fc79caa3026c8b31924c95f4b --- .../SettingsSearchIndexablesProvider.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index 0a846de317f..b5982243e2c 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -41,21 +41,28 @@ import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS; +import static android.provider.SearchIndexablesContract.SLICE_URI_PAIRS_COLUMNS; import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP; +import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; +import android.net.Uri; import android.provider.SearchIndexableResource; import android.provider.SearchIndexablesContract; import android.provider.SearchIndexablesProvider; +import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; +import androidx.slice.SliceViewManager; + import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.slices.SettingsSliceProvider; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -184,6 +191,33 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { return cursor; } + @Override + public Cursor querySliceUriPairs() { + final SliceViewManager manager = SliceViewManager.getInstance(getContext()); + final MatrixCursor cursor = new MatrixCursor(SLICE_URI_PAIRS_COLUMNS); + final Uri baseUri = + new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) + .authority(SettingsSliceProvider.SLICE_AUTHORITY) + .build(); + final Uri platformBaseUri = + new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) + .authority(SettingsSlicesContract.AUTHORITY) + .build(); + + final Collection sliceUris = manager.getSliceDescendants(baseUri); + sliceUris.addAll(manager.getSliceDescendants(platformBaseUri)); + + for (Uri uri : sliceUris) { + cursor.newRow() + .add(SearchIndexablesContract.SliceUriPairColumns.KEY, uri.getLastPathSegment()) + .add(SearchIndexablesContract.SliceUriPairColumns.SLICE_URI, uri); + } + + return cursor; + } + private List getNonIndexableKeysFromProvider(Context context) { final Collection values = FeatureFactory.getFactory(context) .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); @@ -207,7 +241,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { if (System.getProperty(SYSPROP_CRASH_ON_ERROR) != null) { throw new RuntimeException(e); } - Log.e(TAG, "Error trying to get non-indexable keys from: " + clazz.getName() , e); + Log.e(TAG, "Error trying to get non-indexable keys from: " + clazz.getName(), e); continue; }