From 400d13123cde07a328e7ec6133b932b609d18c72 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 14 Aug 2023 12:29:02 -0700 Subject: [PATCH] Fix more kotlin nullable errors in Settings Fix kotlin nullable errors that were exposed by setting the retention of android.annotation.NonNull and android.annotation.Nullable to class retention. Bug: 294110802 Test: builds Change-Id: I2923b3552aaee75a2c5b1ebd9c7fbee882fe4cae --- .../FingerprintEnrollmentIntroV2Fragment.kt | 18 +++++++++--------- .../FingerprintSettingsRenameDialog.kt | 4 ++-- .../enrolling/RemoteAuthEnrollEnrolling.kt | 8 ++++---- ...teAuthEnrollEnrollingRecyclerViewAdapter.kt | 6 +++--- .../remoteauth/settings/RemoteAuthSettings.kt | 6 +++--- .../RemoteAuthSettingsRecyclerViewAdapter.kt | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollmentIntroV2Fragment.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollmentIntroV2Fragment.kt index 88f8391c032..c7fcb669c54 100644 --- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollmentIntroV2Fragment.kt +++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollmentIntroV2Fragment.kt @@ -128,7 +128,7 @@ class FingerprintEnrollmentIntroV2Fragment : Fragment(R.layout.fingerprint_v2_en R.id.icon_link ) .forEach { icon -> - view.findViewById(icon).drawable.colorFilter = colorFilter + view.requireViewById(icon).drawable.colorFilter = colorFilter } // Set the text for the footer text views. @@ -139,12 +139,12 @@ class FingerprintEnrollmentIntroV2Fragment : Fragment(R.layout.fingerprint_v2_en R.id.footer_message_5 to textModel.footerMessageFive, R.id.footer_message_6 to textModel.footerMessageSix, ) - .forEach { pair -> view.findViewById(pair.first).setText(pair.second) } + .forEach { pair -> view.requireViewById(pair.first).setText(pair.second) } setFooterLink(view) - val iconShield: ImageView = view.findViewById(R.id.icon_shield) - val footerMessage6: TextView = view.findViewById(R.id.footer_message_6) + val iconShield: ImageView = view.requireViewById(R.id.icon_shield) + val footerMessage6: TextView = view.requireViewById(R.id.footer_message_6) when (sensorProps?.sensorType) { FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC, FingerprintSensorProperties.TYPE_UDFPS_OPTICAL -> { @@ -157,15 +157,15 @@ class FingerprintEnrollmentIntroV2Fragment : Fragment(R.layout.fingerprint_v2_en } } - view.findViewById(R.id.footer_title_1).setText(textModel.footerTitleOne) - view.findViewById(R.id.footer_title_2).setText(textModel.footerTitleOne) + view.requireViewById(R.id.footer_title_1).setText(textModel.footerTitleOne) + view.requireViewById(R.id.footer_title_2).setText(textModel.footerTitleOne) } } } } private fun setFooterLink(view: View) { - val footerLink: TextView = view.findViewById(R.id.footer_learn_more) + val footerLink: TextView = view.requireViewById(R.id.footer_learn_more) footerLink.movementMethod = LinkMovementMethod.getInstance() footerLink.text = Html.fromHtml( @@ -178,13 +178,13 @@ class FingerprintEnrollmentIntroV2Fragment : Fragment(R.layout.fingerprint_v2_en view: View, ) { val scrollView: ScrollView = - view.findViewById(com.google.android.setupdesign.R.id.sud_scroll_view) + view.requireViewById(com.google.android.setupdesign.R.id.sud_scroll_view) scrollView.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES // Next button responsible for starting the next fragment. val onNextButtonClick: View.OnClickListener = View.OnClickListener { Log.d(TAG, "OnNextClicked") } - val layout: GlifLayout = requireActivity().findViewById(R.id.setup_wizard_layout) + val layout: GlifLayout = requireActivity().requireViewById(R.id.setup_wizard_layout) footerBarMixin = layout.getMixin(FooterBarMixin::class.java) footerBarMixin.primaryButton = FooterButton.Builder(requireActivity()) diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt index 0ebc561a815..84f33ff8d1c 100644 --- a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt +++ b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt @@ -106,8 +106,8 @@ class FingerprintSettingsRenameDialog : InstrumentedDialogFragment() { val dialog = FingerprintSettingsRenameDialog() val onClick = DialogInterface.OnClickListener { _, _ -> - val dialogTextField = - dialog.requireDialog().findViewById(R.id.fingerprint_rename_field) as ImeAwareEditText + val dialogTextField = dialog.requireDialog() + .requireViewById(R.id.fingerprint_rename_field) as ImeAwareEditText val newName = dialogTextField.text.toString() if (!TextUtils.equals(newName, fp.name)) { Log.d(TAG, "rename $fp.name to $newName for $dialog") diff --git a/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt b/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt index 4569760e8b9..dcb81c784e8 100644 --- a/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt +++ b/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt @@ -42,11 +42,11 @@ class RemoteAuthEnrollEnrolling : private val viewModel = RemoteAuthEnrollEnrollingViewModel() private val adapter = RemoteAuthEnrollEnrollingRecyclerViewAdapter() private val progressBar by lazy { - view!!.findViewById(R.id.enrolling_list_progress_bar) + view!!.requireViewById(R.id.enrolling_list_progress_bar) } - private val errorText by lazy { view!!.findViewById(R.id.error_text) } + private val errorText by lazy { view!!.requireViewById(R.id.error_text) } private val recyclerView by lazy { - view!!.findViewById(R.id.discovered_authenticator_list) + view!!.requireViewById(R.id.discovered_authenticator_list) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -124,4 +124,4 @@ class RemoteAuthEnrollEnrolling : errorText.text = "" } } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt b/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt index 81b88018d9a..323c41f0067 100644 --- a/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt +++ b/src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt @@ -46,8 +46,8 @@ class RemoteAuthEnrollEnrollingRecyclerViewAdapter : override fun getItemCount() = uiStates.size class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - private val titleTextView: TextView = view.findViewById(R.id.discovered_authenticator_name) - private val selectButton: ImageView = view.findViewById(R.id.authenticator_radio_button) + private val titleTextView: TextView = view.requireViewById(R.id.discovered_authenticator_name) + private val selectButton: ImageView = view.requireViewById(R.id.authenticator_radio_button) private val checkedDrawable = view.context.getDrawable(R.drawable.ic_radio_button_checked_black_24dp) private val uncheckedDrawable = @@ -63,4 +63,4 @@ class RemoteAuthEnrollEnrollingRecyclerViewAdapter : selectButton.setOnClickListener { discoveredAuthenticatorUiState.onSelect() } } } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt b/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt index ebf13f8f027..93711bf554f 100644 --- a/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt +++ b/src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt @@ -34,11 +34,11 @@ class RemoteAuthSettings : Fragment(R.layout.remote_auth_settings) { val viewModel = RemoteAuthSettingsViewModel() private val adapter = RemoteAuthSettingsRecyclerViewAdapter() private val recyclerView by lazy { - view!!.findViewById(R.id.registered_authenticator_list) + view!!.requireViewById(R.id.registered_authenticator_list) } private val addAuthenticatorLayout by lazy { - view!!.findViewById(R.id.add_authenticator_layout) + view!!.requireViewById(R.id.add_authenticator_layout) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -65,4 +65,4 @@ class RemoteAuthSettings : Fragment(R.layout.remote_auth_settings) { adapter.uiStates = uiState.registeredAuthenticatorUiStates } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt b/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt index f506a0b6a93..f8038bd9b2c 100644 --- a/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt +++ b/src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt @@ -46,12 +46,12 @@ class RemoteAuthSettingsRecyclerViewAdapter() : override fun getItemCount() = uiStates.size class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - private val titleTextView: TextView = view.findViewById(R.id.authenticator_name_text) - private val unregisterButton: ImageView = view.findViewById(R.id.remove_icon) + private val titleTextView: TextView = view.requireViewById(R.id.authenticator_name_text) + private val unregisterButton: ImageView = view.requireViewById(R.id.remove_icon) fun bind(authenticatorUiState: RemoteAuthAuthenticatorItemUiState) { titleTextView.text = authenticatorUiState.name unregisterButton.setOnClickListener { authenticatorUiState.unregister() } } } -} \ No newline at end of file +}