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

Touchpad: remove individual gesture settings

Browse Source 
These were never plumbed in, never mind launched, and are sometimes
causing confusion in design discussions when people have the feature
flag turned on. Let's remove them.

Bug: 245989146
Test: check System > Touchpad > Touchpad gestures option is removed even
      when the flag's enabled
Flag: EXEMPT removing code controlled by a legacy sysprop-based flag
Change-Id: I22ca19faf6fed430bb3f0733867716a02514ac8d
This commit is contained in:
Harry Cutts
2024-12-30 18:15:05 +00:00
parent 382ae17a76
commit d4a469b4ca
23 changed files with 1 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
tests/robotests/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceControllerTest.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (C) 2023 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.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link TrackpadGoBackPreferenceController} */
@RunWith(RobolectricTestRunner.class)
public class TrackpadGoBackPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "gesture_go_back";
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_BACK_ENABLED;
private Context mContext;
private TrackpadGoBackPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadGoBackPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getSliceHighlightMenuRes_expected() {
assertThat(mController.getSliceHighlightMenuRes()).isEqualTo(R.string.menu_key_system);
}
@Test
public void setChecked_true_shouldReturn1() {
mController.setChecked(true);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(1);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_GO_BACK_CHANGED),
eq(true));
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(0);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_GO_BACK_CHANGED),
eq(false));
}
@Test
public void isChecked_providerPutInt1_returnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 1);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
@Test
public void isChecked_providerPutInt0_returnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 0);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
}

117
tests/robotests/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceControllerTest.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (C) 2023 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.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link TrackpadGoHomePreferenceController} */
@RunWith(RobolectricTestRunner.class)
public class TrackpadGoHomePreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "gesture_go_home";
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_HOME_ENABLED;
private Context mContext;
private TrackpadGoHomePreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadGoHomePreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getSliceHighlightMenuRes_expected() {
assertThat(mController.getSliceHighlightMenuRes()).isEqualTo(R.string.menu_key_system);
}
@Test
public void setChecked_true_shouldReturn1() {
mController.setChecked(true);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(1);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_GO_HOME_CHANGED),
eq(true));
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(0);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_GO_HOME_CHANGED),
eq(false));
}
@Test
public void isChecked_providerPutInt1_returnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 1);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
@Test
public void isChecked_providerPutInt0_returnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 0);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
}

117
tests/robotests/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceControllerTest.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (C) 2023 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.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link TrackpadNotificationsPreferenceController} */
@RunWith(RobolectricTestRunner.class)
public class TrackpadNotificationsPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "gesture_notifications";
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED;
private Context mContext;
private TrackpadNotificationsPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadNotificationsPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getSliceHighlightMenuRes_expected() {
assertThat(mController.getSliceHighlightMenuRes()).isEqualTo(R.string.menu_key_system);
}
@Test
public void setChecked_true_shouldReturn1() {
mController.setChecked(true);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(1);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_NOTIFICATION_CHANGED),
eq(true));
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(0);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_NOTIFICATION_CHANGED),
eq(false));
}
@Test
public void isChecked_providerPutInt1_returnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 1);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
@Test
public void isChecked_providerPutInt0_returnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 0);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
}

117
tests/robotests/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceControllerTest.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (C) 2023 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.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link TrackpadRecentAppsPreferenceController} */
@RunWith(RobolectricTestRunner.class)
public class TrackpadRecentAppsPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "gesture_recent_apps";
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED;
private Context mContext;
private TrackpadRecentAppsPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadRecentAppsPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getSliceHighlightMenuRes_expected() {
assertThat(mController.getSliceHighlightMenuRes()).isEqualTo(R.string.menu_key_system);
}
@Test
public void setChecked_true_shouldReturn1() {
mController.setChecked(true);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(1);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_RECENT_APPS_CHANGED),
eq(true));
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(0);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_RECENT_APPS_CHANGED),
eq(false));
}
@Test
public void isChecked_providerPutInt1_returnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 1);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
@Test
public void isChecked_providerPutInt0_returnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 0);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
}

117
tests/robotests/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceControllerTest.java
View File

@@ -1,117 +0,0 @@
/*
* Copyright (C) 2023 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.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link TrackpadSwitchAppsPreferenceController} */
@RunWith(RobolectricTestRunner.class)
public class TrackpadSwitchAppsPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "gesture_switch_apps";
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED;
private Context mContext;
private TrackpadSwitchAppsPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadSwitchAppsPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getSliceHighlightMenuRes_expected() {
assertThat(mController.getSliceHighlightMenuRes()).isEqualTo(R.string.menu_key_system);
}
@Test
public void setChecked_true_shouldReturn1() {
mController.setChecked(true);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(1);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_SWITCH_APPS_CHANGED),
eq(true));
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
assertThat(result).isEqualTo(0);
verify(mFeatureFactory.metricsFeatureProvider).action(
any(),
eq(SettingsEnums.ACTION_GESTURE_SWITCH_APPS_CHANGED),
eq(false));
}
@Test
public void isChecked_providerPutInt1_returnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 1);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
@Test
public void isChecked_providerPutInt0_returnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY, 0);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
}