Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fc7f23f authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix kotlin nullable errors in Settings" into main

parents 7001ebd4 87b870a0

src/com/android/settings/RegulatoryInfoDisplayActivity.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ class RegulatoryInfoDisplayActivity : Activity() { 




        getRegulatoryInfo()?.let {

        getRegulatoryInfo()?.let {

            val view = layoutInflater.inflate(R.layout.regulatory_info, null)

            val view = layoutInflater.inflate(R.layout.regulatory_info, null)

            val image = view.findViewById<ImageView>(R.id.regulatoryInfo)

            val image = view.requireViewById<ImageView>(R.id.regulatoryInfo)

            image.setImageDrawable(it)

            image.setImageDrawable(it)

            builder.setView(view)

            builder.setView(view)

            builder.show()

            builder.show()

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -106,8 +106,8 @@ class FingerprintSettingsRenameDialog : InstrumentedDialogFragment() { 
        val dialog = FingerprintSettingsRenameDialog()

        val dialog = FingerprintSettingsRenameDialog()

        val onClick =

        val onClick =

          DialogInterface.OnClickListener { _, _ ->

          DialogInterface.OnClickListener { _, _ ->

            val dialogTextField =

            val dialogTextField = dialog.requireDialog()

              dialog.requireDialog().findViewById(R.id.fingerprint_rename_field) as ImeAwareEditText

                .requireViewById(R.id.fingerprint_rename_field) as ImeAwareEditText

            val newName = dialogTextField.text.toString()

            val newName = dialogTextField.text.toString()

            if (!TextUtils.equals(newName, fp.name)) {

            if (!TextUtils.equals(newName, fp.name)) {

              Log.d(TAG, "rename $fp.name to $newName for $dialog")

              Log.d(TAG, "rename $fp.name to $newName for $dialog")

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -205,8 +205,8 @@ class FingerprintEnrollIntroFragment : Fragment() { 
    private fun getDescriptionDisabledByAdmin(context: Context): String? {

    private fun getDescriptionDisabledByAdmin(context: Context): String? {

        val defaultStrId: Int =

        val defaultStrId: Int =

            R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled

            R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled

        val devicePolicyManager: DevicePolicyManager = requireActivity()

        val devicePolicyManager: DevicePolicyManager =

            .getSystemService(DevicePolicyManager::class.java)

            checkNotNull(requireActivity().getSystemService(DevicePolicyManager::class.java))





        return devicePolicyManager.resources.getString(FINGERPRINT_UNLOCK_DISABLED) {

        return devicePolicyManager.resources.getString(FINGERPRINT_UNLOCK_DISABLED) {

            context.getString(defaultStrId)

            context.getString(defaultStrId)
@@ -234,7 +234,7 @@ class FingerprintEnrollIntroFragment : Fragment() { 
            else

            else

                View.INVISIBLE

                View.INVISIBLE





        view!!.findViewById<TextView>(R.id.error_text).let {

        view!!.requireViewById<TextView>(R.id.error_text).let {

            when (status.enrollableStatus) {

            when (status.enrollableStatus) {

                FINGERPRINT_ENROLLABLE_OK -> {

                FINGERPRINT_ENROLLABLE_OK -> {

                    it.text = null

                    it.text = null

src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
            WindowManager.LayoutParams.FLAG_SECURE

            WindowManager.LayoutParams.FLAG_SECURE

        )

        )

        dialog.setCanceledOnTouchOutside(false)

        dialog.setCanceledOnTouchOutside(false)

        val textView = dialog.findViewById<TextView>(R.id.esim_id_value)

        val textView = dialog.requireViewById<TextView>(R.id.esim_id_value)

        textView.text = PhoneNumberUtil.expandByTts(eid)

        textView.text = PhoneNumberUtil.expandByTts(eid)





        val qrCodeView = dialog.findViewById<ImageView>(R.id.esim_id_qrcode)

        val qrCodeView = dialog.requireViewById<ImageView>(R.id.esim_id_qrcode)

        qrCodeView.setImageBitmap(getEidQrCode(eid))

        qrCodeView.setImageBitmap(getEidQrCode(eid))





        // After "Tap to show", eid is displayed on preference.

        // After "Tap to show", eid is displayed on preference.

src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ class FullScreenIntentPermissionPreferenceController( 
    private fun isPermissionRequested(): Boolean {

    private fun isPermissionRequested(): Boolean {

        val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS)

        val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS)





        for (requestedPermission in packageInfo.requestedPermissions) {

        for (requestedPermission in packageInfo.requestedPermissions.orEmpty()) {

            if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) {

            if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) {

                return true

                return true

            }

            }