Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ProviderColumn.kt to debug folder

Browse Source 
Bug: 244122804
Test: unit-test & local build gallery
Change-Id: I9f0db4435aae25e22a3b103a5ae3af8a84d6b936
This commit is contained in:
Zekan Qian
2022-12-07 10:25:35 +08:00
parent e4c4a62825
commit fccf3f784b
4 changed files with 6 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/Spa/gallery/AndroidManifest.xml
View File

@@ -38,7 +38,6 @@
<provider
android:name="com.android.settingslib.spa.search.SpaSearchProvider"
android:authorities="com.android.spa.gallery.search.provider"
android:enabled="true"
android:exported="false">
</provider>
@@ -67,7 +66,6 @@
<provider
android:name="com.android.settingslib.spa.debug.DebugProvider"
android:authorities="com.android.spa.gallery.debug.provider"
android:enabled="true"
android:exported="false">
</provider>

4
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugProvider.kt
View File

@@ -27,11 +27,7 @@ import android.database.Cursor
import android.database.MatrixCursor
import android.net.Uri
import android.util.Log
import com.android.settingslib.spa.framework.common.ColumnEnum
import com.android.settingslib.spa.framework.common.QueryEnum
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
import com.android.settingslib.spa.framework.common.addUri
import com.android.settingslib.spa.framework.common.getColumns
import com.android.settingslib.spa.framework.util.KEY_DESTINATION
import com.android.settingslib.spa.framework.util.KEY_HIGHLIGHT_ENTRY
import com.android.settingslib.spa.framework.util.KEY_SESSION_SOURCE_NAME

53
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/ProviderColumn.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/ProviderColumn.kt
View File

@@ -14,10 +14,9 @@
* limitations under the License.
*/
package com.android.settingslib.spa.framework.common
package com.android.settingslib.spa.debug
import android.content.UriMatcher
import androidx.annotation.VisibleForTesting
/**
* Enum to define all column names in provider.
@@ -39,12 +38,6 @@ enum class ColumnEnum(val id: String) {
ENTRY_INTENT_URI("entryIntent"),
ENTRY_HIERARCHY_PATH("entryPath"),
ENTRY_START_ADB("entryStartAdb"),
// Columns related to search
SEARCH_TITLE("searchTitle"),
SEARCH_KEYWORD("searchKw"),
SEARCH_PATH("searchPath"),
SEARCH_STATUS_DISABLED("searchDisabled"),
}
/**
@@ -89,54 +82,16 @@ enum class QueryEnum(
ColumnEnum.ENTRY_HIERARCHY_PATH,
)
),
SEARCH_STATIC_DATA_QUERY(
"search_static", 301,
listOf(
ColumnEnum.ENTRY_ID,
ColumnEnum.ENTRY_INTENT_URI,
ColumnEnum.SEARCH_TITLE,
ColumnEnum.SEARCH_KEYWORD,
ColumnEnum.SEARCH_PATH,
)
),
SEARCH_DYNAMIC_DATA_QUERY(
"search_dynamic", 302,
listOf(
ColumnEnum.ENTRY_ID,
ColumnEnum.ENTRY_INTENT_URI,
ColumnEnum.SEARCH_TITLE,
ColumnEnum.SEARCH_KEYWORD,
ColumnEnum.SEARCH_PATH,
)
),
SEARCH_IMMUTABLE_STATUS_DATA_QUERY(
"search_immutable_status", 303,
listOf(
ColumnEnum.ENTRY_ID,
ColumnEnum.SEARCH_STATUS_DISABLED,
)
),
SEARCH_MUTABLE_STATUS_DATA_QUERY(
"search_mutable_status", 304,
listOf(
ColumnEnum.ENTRY_ID,
ColumnEnum.SEARCH_STATUS_DISABLED,
)
),
}
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
fun QueryEnum.getColumns(): Array<String> {
internal fun QueryEnum.getColumns(): Array<String> {
return columnNames.map { it.id }.toTypedArray()
}
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
fun QueryEnum.getIndex(name: ColumnEnum): Int {
internal fun QueryEnum.getIndex(name: ColumnEnum): Int {
return columnNames.indexOf(name)
}
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
fun QueryEnum.addUri(uriMatcher: UriMatcher, authority: String) {
internal fun QueryEnum.addUri(uriMatcher: UriMatcher, authority: String) {
uriMatcher.addURI(authority, queryPath, queryMatchCode)
}

6
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/provider/Demo.kt
View File

@@ -24,6 +24,7 @@ import androidx.slice.Slice
import androidx.slice.SliceManager
import androidx.slice.builders.ListBuilder
import androidx.slice.builders.SliceAction
import androidx.slice.core.R
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
import com.android.settingslib.spa.slice.createBroadcastPendingIntent
import com.android.settingslib.spa.slice.createBrowsePendingIntent
@@ -52,10 +53,7 @@ fun createDemoSlice(sliceUri: Uri, title: String, summary: String, intent: Pendi
private fun createSliceAction(context: Context, intent: PendingIntent): SliceAction {
return SliceAction.create(
intent,
IconCompat.createWithResource(
context,
com.google.android.material.R.drawable.navigation_empty_icon
),
IconCompat.createWithResource(context, R.drawable.notification_action_background),
ListBuilder.ICON_IMAGE,
"Enter app"
)