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

Commit 9699e134 authored by Yuhan Yang's avatar Yuhan Yang Committed by Android (Google) Code Review
Browse files

Merge "Add custom seekbar in click delay time dialog" into main

parents cf632e19 027aae70
Loading
Loading
Loading
Loading
+93 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@
        android:textSize="20sp"
        android:textColor="?android:attr/textColorPrimary"
        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
        app:layout_constraintBottom_toTopOf="@+id/autoclick_delay_before_click_dialog_subtitle"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +46,6 @@
        android:layout_marginTop="8dp"
        android:textSize="16sp"
        android:textColor="?android:attr/textColorSecondary"
        app:layout_constraintBottom_toTopOf="@+id/autoclick_delay_before_click_value_group"
        app:layout_constraintTop_toBottomOf="@+id/autoclick_delay_before_click_dialog_title"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -60,7 +58,6 @@
        android:layout_marginStart="20dp"
        android:layout_marginTop="16dp"
        app:layout_constraintTop_toBottomOf="@+id/autoclick_delay_before_click_dialog_subtitle"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

@@ -79,6 +76,99 @@
        <RadioButton
            android:id="@+id/accessibility_autoclick_dialog_4sec"
            style="@style/AutoclickDialogRadioButton"/>
        <RadioButton
            android:id="@+id/accessibility_autoclick_dialog_custom"
            android:text="@string/accessibility_autoclick_custom_title"
            style="@style/AutoclickDialogRadioButton"
            />
    </RadioGroup>

    <androidx.constraintlayout.widget.Guideline
        android:id="@+id/paddingStart"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        app:layout_constraintGuide_begin="24dp" />

    <androidx.constraintlayout.widget.Guideline
        android:id="@+id/paddingEnd"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        app:layout_constraintGuide_end="24dp" />

    <androidx.constraintlayout.widget.Group
        android:id="@+id/sliderContainer"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:constraint_referenced_ids="accessibility_autoclick_custom_value,
                                        accessibility_autoclick_custom_value_decrease,
                                        accessibility_autoclick_custom_slider,
                                        accessibility_autoclick_custom_value_increase" />

    <TextView
        android:id="@+id/accessibility_autoclick_custom_value"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="value"
        android:textColor="?android:attr/textColorPrimary"
        app:layout_constrainedHeight="true"
        app:layout_constrainedWidth="true"
        app:layout_constraintEnd_toEndOf="@id/paddingEnd"
        app:layout_constraintStart_toStartOf="@id/paddingStart"
        app:layout_constraintTop_toBottomOf="@id/autoclick_delay_before_click_value_group" />

    <ImageView
        android:id="@+id/accessibility_autoclick_custom_value_decrease"
        android:contentDescription="@string/accessibility_autoclick_shorter_desc"
        android:layout_marginTop="8dp"
        android:layout_width="24dp"
        android:layout_height="24dp"
        android:layout_marginBottom="16dp"
        android:background="?android:attr/selectableItemBackgroundBorderless"
        android:src="@drawable/ic_remove_24dp"
        app:layout_constraintBottom_toBottomOf="@id/sliderBottomBarrier"
        app:layout_constraintTop_toBottomOf="@id/accessibility_autoclick_custom_value"
        app:layout_constraintStart_toStartOf="@id/paddingStart"
        app:layout_constraintEnd_toStartOf="@id/accessibility_autoclick_custom_slider" />

    <SeekBar
        android:id="@+id/accessibility_autoclick_custom_slider"
        style="@android:style/Widget.Material.SeekBar"
        android:min="1"
        android:max="50"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:layout_marginTop="8dp"
        android:layout_marginBottom="16dp"
        app:layout_constrainedHeight="true"
        app:layout_constrainedWidth="true"
        app:layout_constraintBottom_toBottomOf="@id/sliderBottomBarrier"
        app:layout_constraintTop_toBottomOf="@id/accessibility_autoclick_custom_value"
        app:layout_constraintStart_toEndOf="@id/accessibility_autoclick_custom_value_decrease"
        app:layout_constraintEnd_toStartOf="@id/accessibility_autoclick_custom_value_increase" />

    <ImageView
        android:id="@+id/accessibility_autoclick_custom_value_increase"
        android:background="?android:attr/selectableItemBackgroundBorderless"
        android:contentDescription="@string/accessibility_autoclick_longer_desc"
        android:layout_marginTop="8dp"
        android:layout_marginBottom="16dp"
        android:layout_width="24dp"
        android:layout_height="24dp"
        android:src="@drawable/ic_add_24dp"
        app:layout_constraintBottom_toBottomOf="@id/sliderBottomBarrier"
        app:layout_constraintTop_toBottomOf="@id/accessibility_autoclick_custom_value"
        app:layout_constraintStart_toEndOf="@id/accessibility_autoclick_custom_slider"
        app:layout_constraintEnd_toEndOf="@id/paddingEnd" />

    <androidx.constraintlayout.widget.Barrier
        android:id="@+id/sliderBottomBarrier"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:barrierDirection="bottom"
        app:constraint_referenced_ids="accessibility_autoclick_custom_value_decrease,
                                       accessibility_autoclick_custom_slider,
                                       accessibility_autoclick_custom_value_increase" />
</androidx.constraintlayout.widget.ConstraintLayout>
 No newline at end of file