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

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

Merge "Fixes more @Nullable issues in System UI and WMShell." into udc-qpr-dev-plus-aosp

parents 5909e463 d4e65759

packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ open class BaseScreenSharePermissionDialog( 


    private fun createOptionsView(@LayoutRes layoutId: Int?) {

        if (layoutId == null) return

        val stub = findViewById<View>(R.id.options_stub) as ViewStub

        val stub = requireViewById<View>(R.id.options_stub) as ViewStub

        stub.layoutResource = layoutId

        stub.inflate()

    }
@@ -144,8 +144,8 @@ private class OptionsAdapter( 
    override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {

        val inflater = LayoutInflater.from(parent.context)

        val view = inflater.inflate(R.layout.screen_share_dialog_spinner_item_text, parent, false)

        val titleTextView = view.findViewById<TextView>(android.R.id.text1)

        val errorTextView = view.findViewById<TextView>(android.R.id.text2)

        val titleTextView = view.requireViewById<TextView>(android.R.id.text1)

        val errorTextView = view.requireViewById<TextView>(android.R.id.text2)

        titleTextView.text = getItem(position)

        errorTextView.text = options[position].spinnerDisabledText

        if (isEnabled(position)) {