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

Commit 4c691339 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Accessibility Annoucement for the always show taskbar switch" into main

parents 991a40ca 7570f36e
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@
            android:layout_height="wrap_content"
            android:id="@+id/taskbar_pinning_switch"
            android:background="@null"
            android:clickable="false"
            android:gravity="start|center_vertical"
            android:textAlignment="viewStart"
            android:paddingStart="12dp"
+7 −2
Original line number Diff line number Diff line
@@ -98,16 +98,21 @@ constructor(
        popupContainer.getDescendantRectRelativeToSelf(dividerView, outPos)
    }

    @SuppressLint("UseSwitchCompatOrMaterialCode")
    @SuppressLint("UseSwitchCompatOrMaterialCode", "ClickableViewAccessibility")
    override fun onFinishInflate() {
        super.onFinishInflate()
        val taskbarSwitchOption = requireViewById<LinearLayout>(R.id.taskbar_switch_option)
        val alwaysShowTaskbarSwitch = requireViewById<Switch>(R.id.taskbar_pinning_switch)
        val taskbarVisibilityIcon = requireViewById<View>(R.id.taskbar_pinning_visibility_icon)

        alwaysShowTaskbarSwitch.isChecked = alwaysShowTaskbarOn
        alwaysShowTaskbarSwitch.setOnTouchListener { view, event ->
            (view.parent as View).onTouchEvent(event)
        }
        alwaysShowTaskbarSwitch.setOnClickListener { view -> (view.parent as View).performClick() }

        if (ActivityContext.lookupContext<TaskbarActivityContext>(context).isGestureNav) {
            taskbarSwitchOption.setOnClickListener {
                alwaysShowTaskbarSwitch.isClickable = true
                alwaysShowTaskbarSwitch.isChecked = !alwaysShowTaskbarOn
                onClickAlwaysShowTaskbarSwitchOption()
            }