Add a11y setting for disabling touchpad system gestures

Screenshots:
* The new setting: http://shortn/_9JL6nMS3cR
* The disabled "Learn touchpad gestures" button and accompanying footer
  when the setting is off: http://shortn/_FTcNTQAGYj

Test: disable the setting, check three- and four-finger swipes on the
      touchpad stop working; re-enable, check they work again
Test: check the toggle and heading both hide correctly when flag is off
      or no touchpad is connected
Test: check the "Learn touchpad gestures" button is disabled with an
      explanation when gestures are disabled
Bug: 353947750
Bug: 374965372
Flag: com.android.hardware.input.touchpad_system_gesture_disable
Change-Id: Ie7a6ea4e9ddd34710d07f78ab96598207aac4228
This commit is contained in:
Harry Cutts
2024-10-25 15:11:56 +00:00
parent aa34351180
commit b253005342
7 changed files with 154 additions and 1 deletions

View File

@@ -25,14 +25,33 @@ import android.content.Context;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.util.List;
/** Accessibility settings for pointer and touchpad. */
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class PointerTouchpadFragment extends DashboardFragment {
private static final String TAG = "PointerTouchpadFragment";
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
TouchpadSystemGesturesPreferenceController systemGesturesController =
new TouchpadSystemGesturesPreferenceController(
context, "touchpad_system_gestures_enable");
return List.of(
systemGesturesController,
new PreferenceCategoryController(context, "touchpad_category")
.setChildren(List.of(systemGesturesController)));
}
@Override
public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_POINTER_TOUCHPAD;
@@ -54,5 +73,11 @@ public class PointerTouchpadFragment extends DashboardFragment {
protected boolean isPageSearchEnabled(Context context) {
return isTouchpad() || isMouse();
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context);
}
};
}

View File

@@ -21,6 +21,7 @@ import static com.android.systemui.shared.Flags.newTouchpadGesturesTutorial;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.hardware.input.InputSettings;
import android.os.UserHandle;
import android.util.FeatureFlagUtils;
@@ -75,7 +76,14 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr
@Override
public int getAvailabilityStatus() {
boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
if (isTouchpad) {
// If the user's disabled touchpad system gestures in the accessibility settings, the
// tutorial won't work or be relevant, so disable the button.
return InputSettings.useTouchpadSystemGestures(mContext) ? AVAILABLE
: DISABLED_DEPENDENT_SETTING;
} else {
return CONDITIONALLY_UNAVAILABLE;
}
}
private void showTouchpadGestureEducation() {

View File

@@ -0,0 +1,54 @@
/*
* Copyright 2024 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 android.content.Context;
import android.hardware.input.InputSettings;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class TouchpadSystemGesturesPreferenceController extends TogglePreferenceController {
public TouchpadSystemGesturesPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public int getAvailabilityStatus() {
return InputSettings.isTouchpadSystemGestureDisableFeatureFlagEnabled()
&& InputPeripheralsSettingsUtils.isTouchpad() ? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@Override
public boolean isChecked() {
return InputSettings.useTouchpadSystemGestures(mContext);
}
@Override
public boolean setChecked(boolean isChecked) {
InputSettings.setTouchpadSystemGesturesEnabled(mContext, isChecked);
// TODO(b/353947750): add a metric for when the setting changes.
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_accessibility;
}
}

View File

@@ -0,0 +1,35 @@
/*
* Copyright 2024 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 android.content.Context;
import android.hardware.input.InputSettings;
import com.android.settings.core.BasePreferenceController;
public class TrackpadGesturesDisabledFooterPreferenceController extends BasePreferenceController {
public TrackpadGesturesDisabledFooterPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public int getAvailabilityStatus() {
return InputSettings.useTouchpadSystemGestures(mContext) ? CONDITIONALLY_UNAVAILABLE
: AVAILABLE;
}
}