Merge "Rename EntryProvider as SpaSearchProvider" (83a9678c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/gallery/AndroidManifest.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@
		</activity>

		<provider
		android:name=".GalleryEntryProvider"
		android:authorities="com.android.spa.gallery.provider"
		android:name="com.android.settingslib.spa.framework.SpaSearchProvider"
		android:authorities="com.android.spa.gallery.search.provider"
		android:enabled="true"
		android:exported="false">
		</provider>
		@@ -51,7 +51,7 @@
		</activity>
		<provider
		android:name="com.android.settingslib.spa.framework.debug.DebugProvider"
		android:authorities="com.android.spa.gallery.debug"
		android:authorities="com.android.spa.gallery.debug.provider"
		android:enabled="true"
		android:exported="false">
		</provider>

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.settingslib.spa.gallery

		import com.android.settingslib.spa.framework.EntryProvider

		class GalleryEntryProvider : EntryProvider()

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) {

		override val browseActivityClass = GalleryMainActivity::class.java

		override val entryProviderAuthorities = "com.android.spa.gallery.provider"
		override val searchProviderAuthorities = "com.android.spa.gallery.search.provider"

		override val logger = LocalLogger()
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
		import com.android.settingslib.spa.framework.common.addUri
		import com.android.settingslib.spa.framework.common.getColumns

		private const val TAG = "EntryProvider"
		private const val TAG = "SpaSearchProvider"

		/**
		* The content provider to return entry related data, which can be used for search and hierarchy.
		@@ -47,7 +47,7 @@ private const val TAG = "EntryProvider"
		* $ adb shell content query --uri content://<AuthorityPath>/search_mutable_status
		* $ adb shell content query --uri content://<AuthorityPath>/search_immutable_status
		*/
		open class EntryProvider : ContentProvider() {
		class SpaSearchProvider : ContentProvider() {
		private val spaEnvironment get() = SpaEnvironmentFactory.instance
		private val uriMatcher = UriMatcher(UriMatcher.NO_MATCH)

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ abstract class SpaEnvironment(context: Context) {

		open val browseActivityClass: Class<out Activity>? = null

		open val entryProviderAuthorities: String? = null
		open val searchProviderAuthorities: String? = null

		open val logger: SpaLogger = object : SpaLogger {}