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

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

Merge "Make Taskbar Divider PopUp Menu Width Dynamic" into main

parents c40cf867 38478e74
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@
-->
<com.android.launcher3.taskbar.TaskbarDividerPopupView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="@dimen/taskbar_pinning_popup_menu_width"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:minWidth="@dimen/taskbar_pinning_popup_menu_width"
    android:focusable="true"
    android:background="@drawable/popup_background"
    android:orientation="vertical">
@@ -54,10 +55,10 @@
            android:gravity="start|center_vertical"
            android:textAlignment="viewStart"
            android:paddingStart="12dp"
            android:switchPadding="12dp"
            android:layout_weight="1"
            android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
            android:lines="1"
            android:ellipsize="end"
            android:textSize="14sp"
            android:textColor="?android:attr/textColorPrimary"
            android:text="@string/always_show_taskbar" />
+1 −3
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ constructor(

    private lateinit var dividerView: View

    private val menuWidth =
        resources.getDimensionPixelSize(R.dimen.taskbar_pinning_popup_menu_width)
    private val popupCornerRadius = Themes.getDialogCornerRadius(context)
    private val arrowWidth = resources.getDimension(R.dimen.popup_arrow_width)
    private val arrowHeight = resources.getDimension(R.dimen.popup_arrow_height)
@@ -130,7 +128,7 @@ constructor(
    /** Orient object as usual and then center object horizontally. */
    override fun orientAboutObject() {
        super.orientAboutObject()
        x = mTempRect.centerX() - menuWidth / 2f
        x = mTempRect.centerX() - measuredWidth / 2f
    }

    override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean {