PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Physical Keyboard] Move Dialog to DialogFragment" into main

Browse Source
This commit is contained in:
Shaowei Shen
2025-02-06 02:20:41 -08:00
committed by Android (Google) Code Review
parent ec78150e69 120b2d46f7
commit 086c8b7955
11 changed files with 555 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
View File

@@ -18,6 +18,9 @@ package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -25,12 +28,12 @@ import android.hardware.input.InputSettings;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.widget.RadioGroup;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.keyboard.Flags;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
@@ -45,10 +48,13 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLooper;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
KeyboardAccessibilityBounceKeysControllerTest
.ShadowKeyboardAccessibilityBounceKeysDialogFragment.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowAlertDialogCompat.class,
})
@@ -60,6 +66,15 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
private static final String PREFERENCE_KEY = "keyboard_a11y_page_bounce_keys";
@Mock
private Preference mPreference;
@Mock
private Fragment mFragment;
@Mock
private FragmentManager mFragmentManager;
@Mock
private FragmentTransaction mFragmentTransaction;
@Mock
private KeyboardAccessibilityBounceKeysDialogFragment
mKeyboardAccessibilityBounceKeysDialogFragment;
private Context mContext;
private KeyboardAccessibilityBounceKeysController mKeyboardAccessibilityBounceKeysController;
@@ -71,6 +86,11 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
mContext,
PREFERENCE_KEY);
when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
when(mFragment.getParentFragmentManager()).thenReturn(mFragmentManager);
when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
mKeyboardAccessibilityBounceKeysController.setFragment(mFragment);
ShadowKeyboardAccessibilityBounceKeysDialogFragment.setInstance(
mKeyboardAccessibilityBounceKeysDialogFragment);
}
@Test
@@ -107,23 +127,25 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
public void handlePreferenceTreeClick_dialogShows() {
mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
verify(mKeyboardAccessibilityBounceKeysDialogFragment).show(any(FragmentManager.class),
anyString());
}
@Test
public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
/**
* Note: Actually, shadow of KeyboardAccessibilitySlowKeysDialogFragment will not be used.
* Instance that returned with {@link #getInstance} should be set with {@link #setInstance}
*/
@Implements(KeyboardAccessibilityBounceKeysDialogFragment.class)
public static class ShadowKeyboardAccessibilityBounceKeysDialogFragment {
static KeyboardAccessibilityBounceKeysDialogFragment sInstance = null;
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
@Implementation
protected static KeyboardAccessibilityBounceKeysDialogFragment getInstance() {
return sInstance;
}
assertThat(alertDialog.isShowing()).isFalse();
int threshold = InputSettings.getAccessibilityBounceKeysThreshold(mContext);
assertThat(threshold).isEqualTo(200);
public static void setInstance(KeyboardAccessibilityBounceKeysDialogFragment instance) {
sInstance = instance;
}
}
}

81
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysDialogFragmentTest.java Normal file
View File

@@ -0,0 +1,81 @@
/*
* Copyright 2025 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import static com.android.settings.inputmethod.KeyboardAccessibilityKeysDialogFragment.EXTRA_SUBTITLE_RES;
import static com.android.settings.inputmethod.KeyboardAccessibilityKeysDialogFragment.EXTRA_TITLE_RES;
import static com.google.common.truth.Truth.assertThat;
import android.app.AlertDialog;
import android.hardware.input.InputSettings;
import android.os.Bundle;
import android.widget.RadioGroup;
import androidx.fragment.app.testing.FragmentScenario;
import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
public class KeyboardAccessibilityBounceKeysDialogFragmentTest {
private AlertDialog mAlertDialog;
@Before
public void setUp() {
Bundle bundle = new Bundle();
bundle.putInt(EXTRA_TITLE_RES, R.string.bounce_keys_dialog_title);
bundle.putInt(EXTRA_SUBTITLE_RES, R.string.bounce_keys_dialog_subtitle);
FragmentScenario<KeyboardAccessibilityBounceKeysDialogFragment> mFragmentScenario =
FragmentScenario.launch(
KeyboardAccessibilityBounceKeysDialogFragment.class,
bundle,
R.style.Theme_AlertDialog_SettingsLib,
Lifecycle.State.INITIALIZED);
mFragmentScenario.moveToState(Lifecycle.State.RESUMED);
mFragmentScenario.onFragment(fragment -> {
assertThat(fragment.getDialog()).isNotNull();
assertThat(fragment.requireDialog().isShowing()).isTrue();
assertThat(fragment.requireDialog()).isInstanceOf(AlertDialog.class);
mAlertDialog = (AlertDialog) fragment.requireDialog();
});
}
@Test
public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
assertThat(mAlertDialog.isShowing()).isTrue();
RadioGroup radioGroup = mAlertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(mAlertDialog.isShowing()).isFalse();
int threshold = InputSettings.getAccessibilityBounceKeysThreshold(
ApplicationProvider.getApplicationContext());
assertThat(threshold).isEqualTo(200);
}
}

58
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
View File

@@ -18,6 +18,9 @@ package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -25,12 +28,12 @@ import android.hardware.input.InputSettings;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.widget.RadioGroup;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.keyboard.Flags;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
@@ -45,10 +48,13 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLooper;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
KeyboardAccessibilitySlowKeysControllerTest
.ShadowKeyboardAccessibilitySlowKeysDialogFragment.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowAlertDialogCompat.class,
})
@@ -60,6 +66,15 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
private static final String PREFERENCE_KEY = "keyboard_a11y_page_slow_keys";
@Mock
private Preference mPreference;
@Mock
private Fragment mFragment;
@Mock
private FragmentManager mFragmentManager;
@Mock
private FragmentTransaction mFragmentTransaction;
@Mock
private KeyboardAccessibilitySlowKeysDialogFragment
mKeyboardAccessibilitySlowKeysDialogFragment;
private Context mContext;
private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController;
@@ -71,6 +86,11 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
mContext,
PREFERENCE_KEY);
when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
when(mFragment.getParentFragmentManager()).thenReturn(mFragmentManager);
when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
mKeyboardAccessibilitySlowKeysController.setFragment(mFragment);
ShadowKeyboardAccessibilitySlowKeysDialogFragment.setInstance(
mKeyboardAccessibilitySlowKeysDialogFragment);
}
@Test
@@ -107,23 +127,25 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
public void handlePreferenceTreeClick_dialogShows() {
mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
verify(mKeyboardAccessibilitySlowKeysDialogFragment).show(any(FragmentManager.class),
anyString());
}
@Test
public void handlePreferenceTreeClick_performClickOn200_updatesSlowKeysThreshold() {
mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
/**
* Note: Actually, shadow of KeyboardAccessibilitySlowKeysDialogFragment will not be used.
* Instance that returned with {@link #getInstance} should be set with {@link #setInstance}
*/
@Implements(KeyboardAccessibilitySlowKeysDialogFragment.class)
public static class ShadowKeyboardAccessibilitySlowKeysDialogFragment {
static KeyboardAccessibilitySlowKeysDialogFragment sInstance = null;
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
@Implementation
protected static KeyboardAccessibilitySlowKeysDialogFragment getInstance() {
return sInstance;
}
assertThat(alertDialog.isShowing()).isFalse();
int threshold = InputSettings.getAccessibilitySlowKeysThreshold(mContext);
assertThat(threshold).isEqualTo(200);
public static void setInstance(KeyboardAccessibilitySlowKeysDialogFragment instance) {
sInstance = instance;
}
}
}

81
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysDialogFragmentTest.java Normal file
View File

@@ -0,0 +1,81 @@
/*
* Copyright 2025 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import static com.android.settings.inputmethod.KeyboardAccessibilityKeysDialogFragment.EXTRA_SUBTITLE_RES;
import static com.android.settings.inputmethod.KeyboardAccessibilityKeysDialogFragment.EXTRA_TITLE_RES;
import static com.google.common.truth.Truth.assertThat;
import android.app.AlertDialog;
import android.hardware.input.InputSettings;
import android.os.Bundle;
import android.widget.RadioGroup;
import androidx.fragment.app.testing.FragmentScenario;
import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
public class KeyboardAccessibilitySlowKeysDialogFragmentTest {
private AlertDialog mAlertDialog;
@Before
public void setUp() {
Bundle bundle = new Bundle();
bundle.putInt(EXTRA_TITLE_RES, R.string.slow_keys);
bundle.putInt(EXTRA_SUBTITLE_RES, R.string.slow_keys_summary);
FragmentScenario<KeyboardAccessibilitySlowKeysDialogFragment> mFragmentScenario =
FragmentScenario.launch(
KeyboardAccessibilitySlowKeysDialogFragment.class,
bundle,
R.style.Theme_AlertDialog_SettingsLib,
Lifecycle.State.INITIALIZED);
mFragmentScenario.moveToState(Lifecycle.State.RESUMED);
mFragmentScenario.onFragment(fragment -> {
assertThat(fragment.getDialog()).isNotNull();
assertThat(fragment.requireDialog().isShowing()).isTrue();
assertThat(fragment.requireDialog()).isInstanceOf(AlertDialog.class);
mAlertDialog = (AlertDialog) fragment.requireDialog();
});
}
@Test
public void handlePreferenceTreeClick_performClickOn200_updatesSlowKeysThreshold() {
assertThat(mAlertDialog.isShowing()).isTrue();
RadioGroup radioGroup = mAlertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(mAlertDialog.isShowing()).isFalse();
int threshold = InputSettings.getAccessibilitySlowKeysThreshold(
ApplicationProvider.getApplicationContext());
assertThat(threshold).isEqualTo(200);
}
}