Merge "Clean up UI todos." into udc-dev (8c9bc646) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,6 @@ class CredentialManagerRepo(
	val requestInfo: RequestInfo?		val requestInfo: RequestInfo?
	private val providerEnabledList: List<ProviderData>		private val providerEnabledList: List<ProviderData>
	private val providerDisabledList: List<DisabledProviderData>?		private val providerDisabledList: List<DisabledProviderData>?
	// TODO: require non-null.
	val resultReceiver: ResultReceiver?		val resultReceiver: ResultReceiver?

	var initialUiState: UiState		var initialUiState: UiState

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -62,7 +62,6 @@ import androidx.credentials.provider.RemoteEntry
	import org.json.JSONObject		import org.json.JSONObject
	import java.time.Instant		import java.time.Instant

	// TODO: remove all !! checks
	fun getAppLabel(		fun getAppLabel(
	pm: PackageManager,		pm: PackageManager,
	appPackageName: String		appPackageName: String
	@@ -88,7 +87,7 @@ private fun getServiceLabelAndIcon(
	val component = ComponentName.unflattenFromString(providerFlattenedComponentName)		val component = ComponentName.unflattenFromString(providerFlattenedComponentName)
	if (component == null) {		if (component == null) {
	// Test data has only package name not component name.		// Test data has only package name not component name.
	// TODO: remove once test data is removed		// For test data usage only.
	try {		try {
	val pkgInfo = pm.getPackageInfo(		val pkgInfo = pm.getPackageInfo(
	providerFlattenedComponentName,		providerFlattenedComponentName,
	@@ -303,7 +302,6 @@ class GetFlowUtils {
	)		)
	}		}
	}		}
	// TODO: handle empty list due to parsing error.
	return result		return result
	}		}

	@@ -392,7 +390,6 @@ class GetFlowUtils {
	subTitle = actionEntryUi.subtitle?.toString(),		subTitle = actionEntryUi.subtitle?.toString(),
	))		))
	}		}
	// TODO: handle empty list
	return result		return result
	}		}
	}		}

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,11 @@ import com.android.credentialmanager.ui.theme.typography.platformTypography

	/** File copied from PlatformComposeCore. */		/** File copied from PlatformComposeCore. */

	/** The Material 3 theme that should wrap all Platform Composables. */		/**
			* The Material 3 theme that should wrap all Platform Composables.
			*
			* TODO(b/280685309): Merge with the official SysUI platform theme.
			*/
	@Composable		@Composable
	fun PlatformTheme(		fun PlatformTheme(
	isDarkTheme: Boolean = isSystemInDarkTheme(),		isDarkTheme: Boolean = isSystemInDarkTheme(),
	@@ -40,7 +44,6 @@ fun PlatformTheme(
	) {		) {
	val context = LocalContext.current		val context = LocalContext.current

	// TODO(b/230605885): Define our color scheme.
	val colorScheme =		val colorScheme =
	if (isDarkTheme) {		if (isDarkTheme) {
	dynamicDarkColorScheme(context)		dynamicDarkColorScheme(context)