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

Merge "Rename AccessibilityGestureNavigationTutorial to AccessibilityShortcutsTutorial" into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-03-26 06:47:03 +00:00
committed by Android (Google) Code Review
parent 4fe6c0e4ce 4c9d268fdf
commit 2664bb004d
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

@@ -220,12 +220,12 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
return mDialog; return mDialog;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL: case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
if (WizardManagerHelper.isAnySetupWizard(getIntent())) { if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialogForSetupWizard( .createAccessibilityTutorialDialogForSetupWizard(
getPrefContext(), getUserShortcutTypes(), getPrefContext(), getUserShortcutTypes(),
this::callOnTutorialDialogButtonClicked, getLabelName()); this::callOnTutorialDialogButtonClicked, getLabelName());
} else { } else {
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialog( .createAccessibilityTutorialDialog(
getPrefContext(), getUserShortcutTypes(), getPrefContext(), getUserShortcutTypes(),
this::callOnTutorialDialogButtonClicked, getLabelName()); this::callOnTutorialDialogButtonClicked, getLabelName());

20
src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java → src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
View File

@@ -11,7 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License * limitations under the License.
*/ */
package com.android.settings.accessibility; package com.android.settings.accessibility;
@@ -72,10 +72,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* Utility class for creating the dialog that guides users for gesture navigation for * Utility class for creating the dialog that shows tutorials on how to use the selected
* accessibility services. * accessibility shortcut types
*/ */
public final class AccessibilityGestureNavigationTutorial { public final class AccessibilityShortcutsTutorial {
private static final String TAG = "AccessibilityGestureNavigationTutorial"; private static final String TAG = "AccessibilityGestureNavigationTutorial";
/** IntDef enum for dialog type. */ /** IntDef enum for dialog type. */
@@ -92,9 +92,9 @@ public final class AccessibilityGestureNavigationTutorial {
int GESTURE_NAVIGATION_SETTINGS = 2; int GESTURE_NAVIGATION_SETTINGS = 2;
} }
private AccessibilityGestureNavigationTutorial() {} private AccessibilityShortcutsTutorial() {}
private static final DialogInterface.OnClickListener mOnClickListener = private static final DialogInterface.OnClickListener ON_CLICK_LISTENER =
(DialogInterface dialog, int which) -> dialog.dismiss(); (DialogInterface dialog, int which) -> dialog.dismiss();
/** /**
@@ -106,7 +106,7 @@ public final class AccessibilityGestureNavigationTutorial {
final AlertDialog alertDialog = new AlertDialog.Builder(context) final AlertDialog alertDialog = new AlertDialog.Builder(context)
.setView(createTutorialDialogContentView(context, .setView(createTutorialDialogContentView(context,
DialogType.GESTURE_NAVIGATION_SETTINGS)) DialogType.GESTURE_NAVIGATION_SETTINGS))
.setPositiveButton(R.string.accessibility_tutorial_dialog_button, mOnClickListener) .setPositiveButton(R.string.accessibility_tutorial_dialog_button, ON_CLICK_LISTENER)
.setOnDismissListener(onDismissListener) .setOnDismissListener(onDismissListener)
.create(); .create();
@@ -124,7 +124,7 @@ public final class AccessibilityGestureNavigationTutorial {
static AlertDialog createAccessibilityTutorialDialog( static AlertDialog createAccessibilityTutorialDialog(
@NonNull Context context, int shortcutTypes, @NonNull CharSequence featureName) { @NonNull Context context, int shortcutTypes, @NonNull CharSequence featureName) {
return createAccessibilityTutorialDialog( return createAccessibilityTutorialDialog(
context, shortcutTypes, mOnClickListener, featureName); context, shortcutTypes, ON_CLICK_LISTENER, featureName);
} }
static AlertDialog createAccessibilityTutorialDialog( static AlertDialog createAccessibilityTutorialDialog(
@@ -184,7 +184,7 @@ public final class AccessibilityGestureNavigationTutorial {
static AlertDialog createAccessibilityTutorialDialogForSetupWizard(Context context, static AlertDialog createAccessibilityTutorialDialogForSetupWizard(Context context,
int shortcutTypes, CharSequence featureName) { int shortcutTypes, CharSequence featureName) {
return createAccessibilityTutorialDialogForSetupWizard(context, shortcutTypes, return createAccessibilityTutorialDialogForSetupWizard(context, shortcutTypes,
mOnClickListener, featureName); ON_CLICK_LISTENER, featureName);
} }
static AlertDialog createAccessibilityTutorialDialogForSetupWizard( static AlertDialog createAccessibilityTutorialDialogForSetupWizard(
@@ -259,7 +259,7 @@ public final class AccessibilityGestureNavigationTutorial {
private static AlertDialog createDialog(Context context, int dialogType) { private static AlertDialog createDialog(Context context, int dialogType) {
final AlertDialog alertDialog = new AlertDialog.Builder(context) final AlertDialog alertDialog = new AlertDialog.Builder(context)
.setView(createTutorialDialogContentView(context, dialogType)) .setView(createTutorialDialogContentView(context, dialogType))
.setPositiveButton(R.string.accessibility_tutorial_dialog_button, mOnClickListener) .setPositiveButton(R.string.accessibility_tutorial_dialog_button, ON_CLICK_LISTENER)
.create(); .create();
alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE); alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);

4
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -225,12 +225,12 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
return mDialog; return mDialog;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL: case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
if (isAnySetupWizard()) { if (isAnySetupWizard()) {
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialogForSetupWizard( .createAccessibilityTutorialDialogForSetupWizard(
getPrefContext(), getUserShortcutTypes(), getPrefContext(), getUserShortcutTypes(),
this::callOnTutorialDialogButtonClicked, mPackageName); this::callOnTutorialDialogButtonClicked, mPackageName);
} else { } else {
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialog( .createAccessibilityTutorialDialog(
getPrefContext(), getUserShortcutTypes(), getPrefContext(), getUserShortcutTypes(),
this::callOnTutorialDialogButtonClicked, mPackageName); this::callOnTutorialDialogButtonClicked, mPackageName);

2
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -166,7 +166,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
} }
switch (dialogId) { switch (dialogId) {
case DialogEnums.GESTURE_NAVIGATION_TUTORIAL: case DialogEnums.GESTURE_NAVIGATION_TUTORIAL:
return AccessibilityGestureNavigationTutorial return AccessibilityShortcutsTutorial
.showAccessibilityGestureTutorialDialog(getPrefContext()); .showAccessibilityGestureTutorialDialog(getPrefContext());
case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT: case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:
final CharSequence dialogTitle = getShortcutTitle(); final CharSequence dialogTitle = getShortcutTitle();

6
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -42,7 +42,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityGestureNavigationTutorial; import com.android.settings.accessibility.AccessibilityShortcutsTutorial;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
@@ -101,7 +101,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
mA11yTutorialDialogShown = mA11yTutorialDialogShown =
savedInstanceState.getBoolean(KEY_SHOW_A11Y_TUTORIAL_DIALOG, false); savedInstanceState.getBoolean(KEY_SHOW_A11Y_TUTORIAL_DIALOG, false);
if (mA11yTutorialDialogShown) { if (mA11yTutorialDialogShown) {
AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog( AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog(
getContext(), dialog -> mA11yTutorialDialogShown = false); getContext(), dialog -> mA11yTutorialDialogShown = false);
} }
} }
@@ -355,7 +355,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
&& !isAccessibilityFloatingMenuEnabled() && !isAccessibilityFloatingMenuEnabled()
&& (isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) { && (isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) {
mA11yTutorialDialogShown = true; mA11yTutorialDialogShown = true;
AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog(getContext(), AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog(getContext(),
dialog -> mA11yTutorialDialogShown = false); dialog -> mA11yTutorialDialogShown = false);
} else { } else {
mA11yTutorialDialogShown = false; mA11yTutorialDialogShown = false;

12
tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java → tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createAccessibilityTutorialDialog; import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialog;
import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createAccessibilityTutorialDialogForSetupWizard; import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialogForSetupWizard;
import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createShortcutTutorialPages; import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createShortcutTutorialPages;
import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog; import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog;
import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -69,10 +69,10 @@ import org.robolectric.shadows.ShadowLooper;
import java.util.Map; import java.util.Map;
/** Tests for {@link AccessibilityGestureNavigationTutorial}. */ /** Tests for {@link AccessibilityShortcutsTutorial}. */
@Config(shadows = SettingsShadowResources.class) @Config(shadows = SettingsShadowResources.class)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public final class AccessibilityGestureNavigationTutorialTest { public final class AccessibilityShortcutsTutorialTest {
private static final String FAKE_FEATURE_NAME = "Fake Feature Name"; private static final String FAKE_FEATURE_NAME = "Fake Feature Name";
@Rule @Rule