diff options
author | 2022-11-10 23:21:44 +0000 | |
---|---|---|
committer | 2022-11-10 23:21:44 +0000 | |
commit | 83a9678c9b243d2567d3d280f8aa5f60a828d6fa (patch) | |
tree | 39dfd1bdb021cac1d4c9d4410341f49be99f427e | |
parent | 30f727605de87c13f0ec1888398cc13f1e3d52f7 (diff) | |
parent | 98b32e0a064ca9ded8e6a9280278f1532a99e5c2 (diff) |
Merge "Rename EntryProvider as SpaSearchProvider"
-rw-r--r-- | packages/SettingsLib/Spa/gallery/AndroidManifest.xml | 6 | ||||
-rw-r--r-- | packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryEntryProvider.kt | 21 | ||||
-rw-r--r-- | packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt | 2 | ||||
-rw-r--r-- | packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSearchProvider.kt (renamed from packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/EntryProvider.kt) | 4 | ||||
-rw-r--r-- | packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt | 2 |
5 files changed, 7 insertions, 28 deletions
diff --git a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml index f1a24aff4319..50cab84e0d9d 100644 --- a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml +++ b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml @@ -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> diff --git a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryEntryProvider.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryEntryProvider.kt deleted file mode 100644 index 817c209fbcdc..000000000000 --- a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryEntryProvider.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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() diff --git a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt index 742e2712e41a..016b27f0c82c 100644 --- a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt +++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt @@ -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() } diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/EntryProvider.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSearchProvider.kt index 38f41bc44a89..35b9c0fbd16b 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/EntryProvider.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSearchProvider.kt @@ -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) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt index b83104360260..a9cb041cc198 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt @@ -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 {} |