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

Commit c554d5fa authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Fix TaskbarDividerPopupMenu Switch Style 

we recently added support for settings app style switches to Launcher. Use that style for TaskbarDividerPopupMenu Switch

Test: Manual
Bug: 308682758
Flag: LEGACY ENABLE_TASKBAR_PINNING DISABLED
Change-Id: If61a426e4051ebce67601055942667ed93928d15
parent 3222387d

quickstep/res/layout/taskbar_divider_popup_menu.xml

+6 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        android:theme="@style/PopupItem">



        <View

            android:id="@+id/taskbar_pinning_visibility_icon"

            android:layout_margin="6dp"

            android:layout_width="20dp"

            android:layout_height="20dp"
@@ -45,13 +46,17 @@ 
            android:backgroundTint="?android:attr/textColorPrimary" />



        <Switch

            style="@style/BaseIcon"

            style="@style/Switch.SettingsLib"

            android:layout_width="wrap_content"

            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"

            android:layout_weight="1"

            android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

            android:singleLine="true"

            android:ellipsize="end"

            android:textSize="14sp"

quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt

+7 −0
Original line number Diff line number Diff line
@@ -94,12 +94,19 @@ constructor( 
        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

        taskbarSwitchOption.setOnClickListener {

            alwaysShowTaskbarSwitch.isClickable = true

            alwaysShowTaskbarSwitch.isChecked = !alwaysShowTaskbarOn

            onClickAlwaysShowTaskbarSwitchOption()

        }



        if (!alwaysShowTaskbarSwitch.isEnabled) {

            taskbarVisibilityIcon.background.setTint(

                resources.getColor(android.R.color.system_neutral2_500, context.theme)

            )

        }

    }



    /** Orient object as usual and then center object horizontally. */