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

Add Settings page for three finger tap customization

Browse Source 
Test: TouchpadThreeFingerTapFragmentTest
Test: TouchpadThreeFingerTapPreferenceControllerTest
Flag: com.android.hardware.input.touchpad_three_finger_tap_shortcut
Bug: 376249366
Change-Id: I63a9a1cbe5f5ed644c39e1a30aa724ea9e5088cb
This commit is contained in:
Pat Manning
2024-10-29 18:05:25 +00:00
parent 05b9d038de
commit 00ec5248cb
9 changed files with 525 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/com/android/settings/inputmethod/TouchpadThreeFingerTapFragment.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* 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 static com.android.settings.inputmethod.NewKeyboardSettingsUtils.isTouchpad;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/** Input settings for touchpad three finger tap. */
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class TouchpadThreeFingerTapFragment extends DashboardFragment {
private static final String TAG = "TouchpadThreeFingerTapFragment";
@Override
public int getMetricsCategory() {
return SettingsEnums.TOUCHPAD_THREE_FINGER_TAP;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.input_touchpad_three_finger_tap_customization;
}
@Override
protected String getLogTag() {
return TAG;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.input_touchpad_three_finger_tap_customization) {
@Override
protected boolean isPageSearchEnabled(Context context) {
return isTouchpad();
}
};
}

107
src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceController.java Normal file
View File

@@ -0,0 +1,107 @@
/*
* 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.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputSettings;
import android.hardware.input.KeyGestureEvent;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.Map;
public class TouchpadThreeFingerTapPreferenceController extends BasePreferenceController
implements LifecycleEventObserver {
private final Map<Integer, String> mKeyGestureTypeNameMap;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private @Nullable Preference mPreference;
public TouchpadThreeFingerTapPreferenceController(@NonNull Context context,
@NonNull String key) {
super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mKeyGestureTypeNameMap = Map.ofEntries(
Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,
context.getString(R.string.three_finger_tap_launch_gemini)),
Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_HOME,
context.getString(R.string.three_finger_tap_go_home)),
Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_BACK,
context.getString(R.string.three_finger_tap_go_back)),
Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,
context.getString(R.string.three_finger_tap_recent_apps)),
Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED,
context.getString(R.string.three_finger_tap_middle_click)));
}
@Override
public int getAvailabilityStatus() {
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
return (InputSettings.isTouchpadThreeFingerTapShortcutFeatureFlagEnabled() && isTouchpad)
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_system;
}
@Override
public @Nullable CharSequence getSummary() {
int currentType = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
return mKeyGestureTypeNameMap.get(currentType);
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
refreshSummary(mPreference);
}
@Override
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
@NonNull Lifecycle.Event event) {
refreshSummary(mPreference);
if (event == Lifecycle.Event.ON_PAUSE) {
int currentValue =
Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION_CHANGED,
currentValue);
}
}
}

98
src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java Normal file
View File

@@ -0,0 +1,98 @@
/*
* 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 static android.hardware.input.InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP;
import static android.hardware.input.InputGestureData.createTouchpadTrigger;
import android.content.Context;
import android.hardware.input.InputGestureData;
import android.hardware.input.InputManager;
import android.hardware.input.KeyGestureEvent;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
import android.view.PointerIcon;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
public class TouchpadThreeFingerTapSelector extends Preference {
private static final InputGestureData.Trigger THREE_FINGER_TAP_TOUCHPAD_TRIGGER =
createTouchpadTrigger(TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP);
private final InputManager mInputManager;
public TouchpadThreeFingerTapSelector(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.touchpad_three_finger_tap_layout);
mInputManager = context.getSystemService(InputManager.class);
}
@Override
public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
LinearLayout buttonHolder = (LinearLayout) holder.findViewById(R.id.button_holder);
// Intercept hover events so setting row does not highlight when hovering buttons.
buttonHolder.setOnHoverListener((v, e) -> true);
int currentCustomization = Settings.System.getIntForUser(getContext().getContentResolver(),
Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
initRadioButton(holder, R.id.launch_gemini,
KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT, currentCustomization);
initRadioButton(holder, R.id.go_home, KeyGestureEvent.KEY_GESTURE_TYPE_HOME,
currentCustomization);
initRadioButton(holder, R.id.go_back, KeyGestureEvent.KEY_GESTURE_TYPE_BACK,
currentCustomization);
initRadioButton(holder, R.id.recent_apps, KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,
currentCustomization);
initRadioButton(holder, R.id.middle_click,
KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, currentCustomization);
}
private void initRadioButton(@NonNull PreferenceViewHolder holder, int id,
int customGestureType, int currentCustomization) {
RadioButton radioButton = (RadioButton) holder.findViewById(id);
if (radioButton == null) {
return;
}
boolean isUnspecified = customGestureType == KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED;
InputGestureData gesture = isUnspecified ? null : new InputGestureData.Builder()
.setTrigger(THREE_FINGER_TAP_TOUCHPAD_TRIGGER)
.setKeyGestureType(customGestureType)
.build();
radioButton.setOnCheckedChangeListener((v, isChecked) -> {
if (isChecked) {
mInputManager.removeAllCustomInputGestures(InputGestureData.Filter.TOUCHPAD);
if (!isUnspecified) {
mInputManager.addCustomInputGesture(gesture);
}
Settings.System.putIntForUser(getContext().getContentResolver(),
Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION, customGestureType,
UserHandle.USER_CURRENT);
}
});
radioButton.setChecked(currentCustomization == customGestureType);
radioButton.setPointerIcon(PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_ARROW));
}
}