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

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

Merge "Update autoclick delay unit string id" into main

parents d1e102fa bccb31b6

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6038,7 +6038,7 @@ 
        }</string>









    <!-- Summary for autoclick seekbar settings preference when user selected custom item. [CHAR LIMIT=35] -->









    <string name="accessibilty_autoclick_delay_unit_second">{count, plural,









    <string name="accessibility_autoclick_delay_unit_second">{count, plural,









        =1      {{time} second}









        other   {{time} seconds}









        }</string>

























src/com/android/settings/accessibility/AutoclickDelayDialogFragment.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -115,7 +115,7 @@ public class AutoclickDelayDialogFragment extends InstrumentedDialogFragment {







            RadioButton radioButton = dialogView.findViewById(radioButtonId);









            if (radioButton != null) {









                radioButton.setText(AutoclickUtils.getAutoclickDelaySummary(









                        getContext(), R.string.accessibilty_autoclick_delay_unit_second,









                        getContext(), R.string.accessibility_autoclick_delay_unit_second,









                        RADIO_BUTTON_ID_TO_DELAY_TIME.get(radioButtonId)));









            }









        }
































src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -178,6 +178,6 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro







    }









    private CharSequence delayTimeToString(int delayMillis) {









        return AutoclickUtils.getAutoclickDelaySummary(mContext,









                R.string.accessibilty_autoclick_delay_unit_second, delayMillis);









                R.string.accessibility_autoclick_delay_unit_second, delayMillis);









    }









}
























tests/robotests/src/com/android/settings/accessibility/AutoclickUtilsTest.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -40,7 +40,7 @@ public final class AutoclickUtilsTest {







    @Test









    public void getAutoclickDelaySummary_minDelay_shouldReturnOnSummary() {









        final CharSequence summary = AutoclickUtils.getAutoclickDelaySummary(









                mContext, R.string.accessibilty_autoclick_delay_unit_second,









                mContext, R.string.accessibility_autoclick_delay_unit_second,









                MIN_AUTOCLICK_DELAY_MS);









        assertThat(summary.toString()).isEqualTo("0.2 seconds");









    }








@@ -48,7 +48,7 @@ public final class AutoclickUtilsTest {







    @Test









    public void getAutoclickDelaySummary_maxDelay_shouldReturnOnSummary() {









        final CharSequence summary = AutoclickUtils.getAutoclickDelaySummary(









                mContext, R.string.accessibilty_autoclick_delay_unit_second,









                mContext, R.string.accessibility_autoclick_delay_unit_second,









                MAX_AUTOCLICK_DELAY_MS);









        assertThat(summary.toString()).isEqualTo("1 second");









    }