PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix more kotlin nullable errors in Settings" into main

Browse Source
This commit is contained in:
Colin Cross
2023-08-23 16:39:29 +00:00
committed by Android (Google) Code Review
parent 344a4da39f 400d13123c
commit 05bd1b7102
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollmentIntroV2Fragment.kt
View File

@@ -128,7 +128,7 @@ class FingerprintEnrollmentIntroV2Fragment : Fragment(R.layout.fingerprint_v2_en
R.id.icon_link
)
.forEach { icon ->
view.findViewById<ImageView>(icon).drawable.colorFilter = colorFilter
view.requireViewById<ImageView>(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<TextView>(pair.first).setText(pair.second) }
.forEach { pair -> view.requireViewById<TextView>(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<TextView?>(R.id.footer_title_1).setText(textModel.footerTitleOne)
view.findViewById<TextView?>(R.id.footer_title_2).setText(textModel.footerTitleOne)
view.requireViewById<TextView?>(R.id.footer_title_1).setText(textModel.footerTitleOne)
view.requireViewById<TextView?>(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())

4
src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
View File

@@ -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")

8
src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrolling.kt
View File

@@ -42,11 +42,11 @@ class RemoteAuthEnrollEnrolling :
private val viewModel = RemoteAuthEnrollEnrollingViewModel()
private val adapter = RemoteAuthEnrollEnrollingRecyclerViewAdapter()
private val progressBar by lazy {
view!!.findViewById<ProgressBar>(R.id.enrolling_list_progress_bar)
view!!.requireViewById<ProgressBar>(R.id.enrolling_list_progress_bar)
}
private val errorText by lazy { view!!.findViewById<TextView>(R.id.error_text) }
private val errorText by lazy { view!!.requireViewById<TextView>(R.id.error_text) }
private val recyclerView by lazy {
view!!.findViewById<RecyclerView>(R.id.discovered_authenticator_list)
view!!.requireViewById<RecyclerView>(R.id.discovered_authenticator_list)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -124,4 +124,4 @@ class RemoteAuthEnrollEnrolling :
errorText.text = ""
}
}
}
}

6
src/com/android/settings/remoteauth/enrolling/RemoteAuthEnrollEnrollingRecyclerViewAdapter.kt
View File

@@ -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() }
}
}
}
}

6
src/com/android/settings/remoteauth/settings/RemoteAuthSettings.kt
View File

@@ -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<RecyclerView>(R.id.registered_authenticator_list)
view!!.requireViewById<RecyclerView>(R.id.registered_authenticator_list)
}
private val addAuthenticatorLayout by lazy {
view!!.findViewById<ConstraintLayout>(R.id.add_authenticator_layout)
view!!.requireViewById<ConstraintLayout>(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
}
}
}

6
src/com/android/settings/remoteauth/settings/RemoteAuthSettingsRecyclerViewAdapter.kt
View File

@@ -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() }
}
}
}
}