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

Commit abd0506e authored by Yuhan Yang's avatar Yuhan Yang
Browse files

Update default delay time in packages/apps/Settings 

Bug: 390460859
Test: atest AutoclickPreferenceControllerTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: Iae71c96b40a814c2ad89fcebefb67b330c95813c
parent 1c1dd907

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

+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


package com.android.settings.accessibility;



import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_DEFAULT;

import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT;



import android.app.Dialog;

import android.app.settings.SettingsEnums;
@@ -78,8 +78,7 @@ public class AutoclickDelayDialogFragment extends InstrumentedDialogFragment { 
                            int checkedRadioButtonId =

                                    radioGroup.getCheckedRadioButtonId();



                            // TODO(b/390460859): Update AUTOCLICK_DELAY_DEFAULT value to 1 sec.

                            int delay = AUTOCLICK_DELAY_DEFAULT;

                            int delay = AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT;

                            if (RADIO_BUTTON_ID_TO_DELAY_TIME

                                    .containsKey(checkedRadioButtonId)) {

                                delay = RADIO_BUTTON_ID_TO_DELAY_TIME.get(checkedRadioButtonId);
@@ -102,7 +101,7 @@ public class AutoclickDelayDialogFragment extends InstrumentedDialogFragment { 
        // TODO(b/390460859): Add custom seekbar for other delay time values.

        final int autoclickDelay = Settings.Secure.getInt(getContext().getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,

                AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);

                AccessibilityManager.AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT);



        Integer radioButtonId = RADIO_BUTTON_ID_TO_DELAY_TIME.inverse().get(autoclickDelay);

        if (radioButtonId != null) {

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

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;



import com.android.server.accessibility.Flags;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;
@@ -57,7 +58,9 @@ public class AutoclickPreferenceController extends BasePreferenceController { 
        }

        final int delayMillis = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,

                AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);

                Flags.enableAutoclickIndicator()

                ? AccessibilityManager.AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT

                : AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);

        final int summaryIndex = getAutoclickPreferenceSummaryIndex(delayMillis);

        return AutoclickUtils.getAutoclickDelaySummary(mContext,

                AUTOCLICK_PREFERENCE_SUMMARIES[summaryIndex], delayMillis);

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.accessibility;



import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_DEFAULT;

import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT;



import static com.google.common.truth.Truth.assertThat;
@@ -49,7 +49,7 @@ public class AutoclickDelayDialogFragmentTest { 
        Settings.Secure.putInt(

                ApplicationProvider.getApplicationContext().getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,

                AUTOCLICK_DELAY_DEFAULT);

                AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT);



        mFragmentScenario = FragmentScenario.launch(

                AutoclickDelayDialogFragment.class,
@@ -92,7 +92,7 @@ public class AutoclickDelayDialogFragmentTest { 
        final int autoclickDelay = Settings.Secure.getInt(

                ApplicationProvider.getApplicationContext().getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,

                AUTOCLICK_DELAY_DEFAULT);

                AUTOCLICK_DELAY_WITH_INDICATOR_DEFAULT);



        assertThat(autoclickDelay).isEqualTo(800);

    }