diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-27 11:09:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-27 11:09:31 +0000 |
| commit | c050807cdc3837e3875a22ca384334be898f04de (patch) | |
| tree | eb492cb33d5c53001585b43af3321a4097af3dcb /src/com/android/settings/search | |
| parent | 0c247b82a5c4f1b61694d1998a3e0572bb3bf35f (diff) | |
| parent | 15da32c33f2581463031fcda43bca3cfbde47048 (diff) | |
| download | packages_apps_Settings-c050807cdc3837e3875a22ca384334be898f04de.tar.gz packages_apps_Settings-c050807cdc3837e3875a22ca384334be898f04de.tar.bz2 packages_apps_Settings-c050807cdc3837e3875a22ca384334be898f04de.zip | |
Merge changes from topic "query_nonpublic_slices"
* changes:
Enable Settings Search to query private Slices.
Add the impl for the ability to query non-public Slices
Diffstat (limited to 'src/com/android/settings/search')
| -rw-r--r-- | src/com/android/settings/search/SettingsSearchIndexablesProvider.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index c619deccaa..237e58f526 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -61,6 +61,7 @@ import android.util.Log; import androidx.annotation.Nullable; import androidx.slice.SliceViewManager; +import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFeatureProvider; import com.android.settings.overlay.FeatureFactory; @@ -216,11 +217,13 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { public Cursor querySliceUriPairs() { final SliceViewManager manager = SliceViewManager.getInstance(getContext()); final MatrixCursor cursor = new MatrixCursor(SLICE_URI_PAIRS_COLUMNS); - final Uri baseUri = - new Uri.Builder() + final String queryUri = getContext().getString(R.string.config_non_public_slice_query_uri); + final Uri baseUri = !TextUtils.isEmpty(queryUri) ? Uri.parse(queryUri) + : new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) .authority(SettingsSliceProvider.SLICE_AUTHORITY) .build(); + final Uri platformBaseUri = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) |