Merge "Remove "ui" from package name from shared project." into main (ae878a61) · Commits · e / os / android_frameworks_base

packages/CredentialManager/shared/src/com/android/credentialmanager/ui/IntentParser.kt→packages/CredentialManager/shared/src/com/android/credentialmanager/IntentParser.kt

+42 −0

Original line number	Diff line number	Diff line
		@@ -14,23 +14,17 @@
		* limitations under the License.
		*/

		package com.android.credentialmanager.ui
		package com.android.credentialmanager

		import android.content.Intent
		import android.credentials.ui.GetCredentialProviderData
		import android.credentials.ui.RequestInfo
		import com.android.credentialmanager.ui.ktx.cancelUiRequest
		import com.android.credentialmanager.ui.ktx.getCredentialProviderDataList
		import com.android.credentialmanager.ui.ktx.requestInfo
		import com.android.credentialmanager.ui.mapper.toCancel
		import com.android.credentialmanager.ui.model.Request
		import com.google.common.collect.ImmutableList
		import com.google.common.collect.ImmutableMap
		import com.android.credentialmanager.ktx.requestInfo
		import com.android.credentialmanager.mapper.toGet
		import com.android.credentialmanager.mapper.toRequestCancel
		import com.android.credentialmanager.model.Request

		fun Intent.parse(): Request {
		cancelUiRequest?.let {
		return it.toCancel()
		}
		this.toRequestCancel()?.let { return it }

		return when (requestInfo?.type) {
		RequestInfo.TYPE_CREATE -> {
		@@ -38,19 +32,7 @@ fun Intent.parse(): Request {
		}

		RequestInfo.TYPE_GET -> {
		Request.Get(
		providers = ImmutableMap.copyOf(
		getCredentialProviderDataList.associateBy { it.providerFlattenedComponentName }
		),
		entries = ImmutableList.copyOf(
		getCredentialProviderDataList.map { providerData ->
		check(providerData is GetCredentialProviderData) {
		"Invalid provider data type for GetCredentialRequest"
		}
		providerData
		}.flatMap { it.credentialEntries }
		)
		)
		this.toGet()
		}

		else -> {

packages/CredentialManager/shared/src/com/android/credentialmanager/ui/LogConstants.kt→packages/CredentialManager/shared/src/com/android/credentialmanager/LogConstants.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,6 @@
		* limitations under the License.
		*/

		package com.android.credentialmanager.ui
		package com.android.credentialmanager

		const val TAG = "CredentialSelector"

packages/CredentialManager/shared/src/com/android/credentialmanager/ui/factory/CredentialEntryFactory.kt→packages/CredentialManager/shared/src/com/android/credentialmanager/factory/CredentialEntryFactory.kt

+1 −1

Original line number	Diff line number	Diff line
		package com.android.credentialmanager.ui.factory
		package com.android.credentialmanager.factory

		import android.app.slice.Slice
		import android.credentials.Credential

packages/CredentialManager/shared/src/com/android/credentialmanager/ui/ktx/IntentKtx.kt→packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/IntentKtx.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.credentialmanager.ui.ktx
		package com.android.credentialmanager.ktx

		import android.content.Intent
		import android.credentials.ui.CancelUiRequest

packages/CredentialManager/shared/src/com/android/credentialmanager/ui/ktx/PackageManagerKtx.kt→packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/PackageManagerKtx.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,12 +14,12 @@
		* limitations under the License.
		*/

		package com.android.credentialmanager.ui.ktx
		package com.android.credentialmanager.ktx

		import android.content.pm.PackageManager
		import android.text.TextUtils
		import android.util.Log
		import com.android.credentialmanager.ui.TAG
		import com.android.credentialmanager.TAG

		fun PackageManager.appLabel(appPackageName: String): String? =
		try {