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

		var initialUiState: UiState

+1 −4

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

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

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

+5 −2

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

		/** 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
		fun PlatformTheme(
		isDarkTheme: Boolean = isSystemInDarkTheme(),
		@@ -40,7 +44,6 @@ fun PlatformTheme(
		) {
		val context = LocalContext.current

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