diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5cae1edd9d0..43696347158 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -641,20 +641,6 @@ android:value="@string/menu_key_connected_devices"/> - - - - - - - - - wallet pay, tap, payments backup, back up - gesture face, unlock, auth, sign in face, unlock, auth, sign in, fingerprint, biometric imei, meid, min, prl version, imei sv @@ -10037,9 +10036,6 @@ See notifications quickly - - Assist gesture - On Off diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml deleted file mode 100644 index 2426516fe7f..00000000000 --- a/res/xml/assist_gesture_settings.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml index 48813606fe9..035c7f7c801 100644 --- a/res/xml/gestures.xml +++ b/res/xml/gestures.xml @@ -20,12 +20,6 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/gesture_preference_title"> - - - - buildPreferenceControllers(Context context, Lifecycle lifecycle) { final List controllers = new ArrayList<>(); diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index 3100706bf26..a06af8eb9e8 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -108,7 +108,6 @@ import com.android.settings.fuelgauge.AdvancedPowerUsageDetail; import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.fuelgauge.batteryusage.PowerUsageSummary; -import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.ButtonNavigationSettingsFragment; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; @@ -264,7 +263,6 @@ public class SettingsGateway { WifiDisplaySettings.class.getName(), PowerUsageSummary.class.getName(), AccountSyncSettings.class.getName(), - AssistGestureSettings.class.getName(), FaceSettings.class.getName(), FingerprintSettings.FingerprintSettingsFragment.class.getName(), FingerprintSettingsV2Fragment.class.getName(), diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java deleted file mode 100644 index bc87ffea9e6..00000000000 --- a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import android.content.Context; - -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; - -import java.util.List; - -/** Feature provider for the assist gesture. */ -public interface AssistGestureFeatureProvider { - - /** Returns true if the assist gesture is supported. */ - boolean isSupported(Context context); - - /** Returns true if the sensor is available. */ - boolean isSensorAvailable(Context context); - - /** Returns a list of additional preference controllers */ - List getControllers(Context context, Lifecycle lifecycle); - -} diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java deleted file mode 100644 index 11c6b225395..00000000000 --- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import android.content.Context; - -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; - -import java.util.ArrayList; -import java.util.List; - -public class AssistGestureFeatureProviderImpl implements AssistGestureFeatureProvider { - - @Override - public boolean isSupported(Context context) { - return false; - } - - @Override - public boolean isSensorAvailable(Context context) { - return false; - } - - @Override - public List getControllers(Context context, Lifecycle lifecycle) { - return new ArrayList<>(); - } - -} diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java deleted file mode 100644 index f56416c3d6f..00000000000 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; - -import com.android.settings.R; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@SearchIndexable -public class AssistGestureSettings extends DashboardFragment { - - private static final String TAG = "AssistGesture"; - - @Override - public int getMetricsCategory() { - return SettingsEnums.SETTINGS_ASSIST_GESTURE; - } - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.assist_gesture_settings; - } - - @Override - protected List createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, getSettingsLifecycle()); - } - - private static List buildPreferenceControllers(Context context, - Lifecycle lifecycle) { - final List controllers = new ArrayList<>(); - controllers.addAll(FeatureFactory.getFactory(context).getAssistGestureFeatureProvider() - .getControllers(context, lifecycle)); - - return controllers; - } - - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.assist_gesture_settings; - return Arrays.asList(sir); - } - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null /* lifecycle */); - } - - @Override - protected boolean isPageSearchEnabled(Context context) { - AssistGestureSettingsPreferenceController controller = - new AssistGestureSettingsPreferenceController(context, - "gesture_assist_input_summary"); - controller.setAssistOnly(false); - return controller.isAvailable(); - } - }; -} - diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java deleted file mode 100644 index 49a9de62827..00000000000 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED; -import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED; - -import android.content.Context; -import android.provider.Settings; -import android.util.Log; - -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - -import com.android.settings.R; -import com.android.settings.overlay.FeatureFactory; - -public class AssistGestureSettingsPreferenceController extends GesturePreferenceController { - - private static final String TAG = "AssistGesture"; - private static final String PREF_KEY_VIDEO = "gesture_assist_video"; - - private static final String SECURE_KEY_ASSIST = ASSIST_GESTURE_ENABLED; - private static final String SECURE_KEY_SILENCE = ASSIST_GESTURE_SILENCE_ALERTS_ENABLED; - private static final int ON = 1; - private static final int OFF = 0; - - private final AssistGestureFeatureProvider mFeatureProvider; - private boolean mWasAvailable; - - private PreferenceScreen mScreen; - private Preference mPreference; - - @VisibleForTesting - boolean mAssistOnly; - - public AssistGestureSettingsPreferenceController(Context context, String key) { - super(context, key); - mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider(); - mWasAvailable = isAvailable(); - } - - @Override - public int getAvailabilityStatus() { - final boolean isSupported = mFeatureProvider.isSupported(mContext); - final boolean isSensorAvailable = mFeatureProvider.isSensorAvailable(mContext); - final boolean isAvailable = mAssistOnly ? isSupported : isSensorAvailable; - Log.d(TAG, "mAssistOnly:" + mAssistOnly + ", isSupported:" + isSupported - + ", isSensorAvailable:" + isSensorAvailable); - return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE; - } - - @Override - public void displayPreference(PreferenceScreen screen) { - mScreen = screen; - mPreference = screen.findPreference(getPreferenceKey()); - super.displayPreference(screen); - } - - @Override - public void onStart() { - if (mWasAvailable != isAvailable()) { - // Only update the preference visibility if the availability has changed -- otherwise - // the preference may be incorrectly added to screens with collapsed sections. - updatePreference(); - mWasAvailable = isAvailable(); - } - } - - public AssistGestureSettingsPreferenceController setAssistOnly(boolean assistOnly) { - mAssistOnly = assistOnly; - return this; - } - - private void updatePreference() { - if (mPreference == null) { - return; - } - - if (isAvailable()) { - if (mScreen.findPreference(getPreferenceKey()) == null) { - mScreen.addPreference(mPreference); - } - } else { - mScreen.removePreference(mPreference); - } - } - - private boolean isAssistGestureEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - SECURE_KEY_ASSIST, ON) != 0; - } - - private boolean isSilenceGestureEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - SECURE_KEY_SILENCE, ON) != 0; - } - - @Override - public boolean setChecked(boolean isChecked) { - return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY_ASSIST, - isChecked ? ON : OFF); - } - - @Override - protected String getVideoPrefKey() { - return PREF_KEY_VIDEO; - } - - @Override - public CharSequence getSummary() { - boolean isEnabled = isAssistGestureEnabled() && mFeatureProvider.isSupported(mContext); - if (!mAssistOnly) { - isEnabled = isEnabled || isSilenceGestureEnabled(); - } - return mContext.getText( - isEnabled ? R.string.gesture_setting_on : R.string.gesture_setting_off); - } - - @Override - public boolean isChecked() { - return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY_ASSIST, OFF) == ON; - } -} diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 5428eac3982..e8c4b934663 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -60,8 +60,6 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle new AmbientDisplayConfiguration(context); final List controllers = new ArrayList<>(); - controllers.add(new AssistGestureSettingsPreferenceController(context, FAKE_PREF_KEY) - .setAssistOnly(false)); controllers.add(new SwipeToNotificationPreferenceController(context, FAKE_PREF_KEY)); controllers.add(new DoubleTwistPreferenceController(context, FAKE_PREF_KEY)); controllers.add(new DoubleTapPowerPreferenceController(context, FAKE_PREF_KEY)); diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt index bc4f9f3d431..5b559b54a39 100644 --- a/src/com/android/settings/overlay/FeatureFactory.kt +++ b/src/com/android/settings/overlay/FeatureFactory.kt @@ -30,7 +30,6 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider import com.android.settings.fuelgauge.BatterySettingsFeatureProvider import com.android.settings.fuelgauge.BatteryStatusFeatureProvider import com.android.settings.fuelgauge.PowerUsageFeatureProvider -import com.android.settings.gestures.AssistGestureFeatureProvider import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider import com.android.settings.localepicker.LocaleFeatureProvider @@ -54,8 +53,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider * To provide a factory implementation, implementors should call [setFactory] in their Application. */ abstract class FeatureFactory { - abstract val assistGestureFeatureProvider: AssistGestureFeatureProvider - /** * Gets implementation for the Suggestion Feature provider. */ diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt index 7e973413460..590d8f2fc0c 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt @@ -43,7 +43,6 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl import com.android.settings.fuelgauge.BatterySettingsFeatureProviderImpl import com.android.settings.fuelgauge.BatteryStatusFeatureProviderImpl import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl -import com.android.settings.gestures.AssistGestureFeatureProviderImpl import com.android.settings.homepage.contextualcards.ContextualCardFeatureProviderImpl import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider import com.android.settings.inputmethod.KeyboardSettingsFeatureProviderImpl @@ -137,8 +136,6 @@ open class FeatureFactoryImpl : FeatureFactory() { override fun getUserFeatureProvider(context: Context) = userFeatureProvider - override val assistGestureFeatureProvider by lazy { AssistGestureFeatureProviderImpl() } - override val slicesFeatureProvider by lazy { SlicesFeatureProviderImpl() } override val accountFeatureProvider: AccountFeatureProvider by lazy { diff --git a/tests/robotests/res/xml-mcc999/video_preference.xml b/tests/robotests/res/xml-mcc999/video_preference.xml index fcf5c6d88bd..5582a65cdc1 100644 --- a/tests/robotests/res/xml-mcc999/video_preference.xml +++ b/tests/robotests/res/xml-mcc999/video_preference.xml @@ -20,13 +20,13 @@ xmlns:settings="http://schemas.android.com/apk/res-auto"> diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java deleted file mode 100644 index 498494635da..00000000000 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import android.app.admin.DevicePolicyManager; -import android.content.Context; - -import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.shadow.ShadowSecureSettings; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; - -@RunWith(RobolectricTestRunner.class) -@Config(shadows = ShadowSecureSettings.class) -public class AssistGestureSettingsPreferenceControllerTest { - - private static final String KEY_ASSIST = "gesture_assist"; - - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mContext; - private FakeFeatureFactory mFactory; - private AssistGestureSettingsPreferenceController mController; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - doReturn(mock(DevicePolicyManager.class)).when(mContext) - .getSystemService(Context.DEVICE_POLICY_SERVICE); - mFactory = FakeFeatureFactory.setupForTest(); - mController = new AssistGestureSettingsPreferenceController(mContext, KEY_ASSIST); - mController.setAssistOnly(false); - } - - @Test - public void isAvailable_whenSupported_shouldReturnTrue() { - mController.mAssistOnly = false; - when(mFactory.assistGestureFeatureProvider.isSensorAvailable(mContext)).thenReturn(true); - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_whenUnsupported_shouldReturnFalse() { - when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(false); - assertThat(mController.isAvailable()).isFalse(); - } -} - diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java deleted file mode 100644 index 17db208f787..00000000000 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2017 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.gestures; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.provider.SearchIndexableResource; - -import com.android.settings.R; -import com.android.settings.testutils.FakeFeatureFactory; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; - -import java.util.List; - -@RunWith(RobolectricTestRunner.class) -public class AssistGestureSettingsTest { - - private FakeFeatureFactory mFakeFeatureFactory; - private AssistGestureSettings mSettings; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mFakeFeatureFactory = FakeFeatureFactory.setupForTest(); - mSettings = new AssistGestureSettings(); - } - - @Test - public void testGetPreferenceScreenResId() { - assertThat(mSettings.getPreferenceScreenResId()) - .isEqualTo(R.xml.assist_gesture_settings); - } - - @Test - public void testSearchIndexProvider_shouldIndexResource() { - final List indexRes = - AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( - RuntimeEnvironment.application, true /* enabled */); - - assertThat(indexRes).isNotNull(); - assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId()); - } - - @Test - public void testSearchIndexProvider_noSensor_shouldDisablePageSearch() { - when(mFakeFeatureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class))) - .thenReturn(false); - - assertThat(AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - RuntimeEnvironment.application)) - .isNotEmpty(); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 67519b9a1c4..c50d6b9381b 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -34,7 +34,6 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; import com.android.settings.fuelgauge.BatterySettingsFeatureProvider; import com.android.settings.fuelgauge.BatteryStatusFeatureProvider; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; -import com.android.settings.gestures.AssistGestureFeatureProvider; import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider; import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider; import com.android.settings.localepicker.LocaleFeatureProvider; @@ -75,7 +74,6 @@ public class FakeFeatureFactory extends FeatureFactory { public final SecurityFeatureProvider securityFeatureProvider; public final SuggestionFeatureProvider suggestionsFeatureProvider; public final UserFeatureProvider userFeatureProvider; - public final AssistGestureFeatureProvider assistGestureFeatureProvider; public final AccountFeatureProvider mAccountFeatureProvider; public final BluetoothFeatureProvider mBluetoothFeatureProvider; public final FaceFeatureProvider mFaceFeatureProvider; @@ -122,7 +120,6 @@ public class FakeFeatureFactory extends FeatureFactory { securityFeatureProvider = mock(SecurityFeatureProvider.class); suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class); userFeatureProvider = mock(UserFeatureProvider.class); - assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class); slicesFeatureProvider = mock(SlicesFeatureProvider.class); mAccountFeatureProvider = mock(AccountFeatureProvider.class); mContextualCardFeatureProvider = mock(ContextualCardFeatureProvider.class); @@ -215,11 +212,6 @@ public class FakeFeatureFactory extends FeatureFactory { return userFeatureProvider; } - @Override - public AssistGestureFeatureProvider getAssistGestureFeatureProvider() { - return assistGestureFeatureProvider; - } - @Override public SlicesFeatureProvider getSlicesFeatureProvider() { return slicesFeatureProvider; diff --git a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt index 59665cf3974..5b47e1397f7 100644 --- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt +++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt @@ -31,7 +31,6 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider import com.android.settings.fuelgauge.BatterySettingsFeatureProvider import com.android.settings.fuelgauge.BatteryStatusFeatureProvider import com.android.settings.fuelgauge.PowerUsageFeatureProvider -import com.android.settings.gestures.AssistGestureFeatureProvider import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider import com.android.settings.localepicker.LocaleFeatureProvider @@ -62,8 +61,6 @@ class FakeFeatureFactory : FeatureFactory() { setFactory(appContext, this) } - override val assistGestureFeatureProvider: AssistGestureFeatureProvider - get() = TODO("Not yet implemented") override val suggestionFeatureProvider: SuggestionFeatureProvider get() = TODO("Not yet implemented") override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java index b71cd9d8ff1..897cf9ad6ff 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -34,7 +34,6 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; import com.android.settings.fuelgauge.BatterySettingsFeatureProvider; import com.android.settings.fuelgauge.BatteryStatusFeatureProvider; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; -import com.android.settings.gestures.AssistGestureFeatureProvider; import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider; import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider; import com.android.settings.localepicker.LocaleFeatureProvider; @@ -74,7 +73,6 @@ public class FakeFeatureFactory extends FeatureFactory { public final SecurityFeatureProvider securityFeatureProvider; public final SuggestionFeatureProvider suggestionsFeatureProvider; public final UserFeatureProvider userFeatureProvider; - public final AssistGestureFeatureProvider assistGestureFeatureProvider; public final AccountFeatureProvider mAccountFeatureProvider; public final BluetoothFeatureProvider mBluetoothFeatureProvider; public final FaceFeatureProvider mFaceFeatureProvider; @@ -121,7 +119,6 @@ public class FakeFeatureFactory extends FeatureFactory { securityFeatureProvider = mock(SecurityFeatureProvider.class); suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class); userFeatureProvider = mock(UserFeatureProvider.class); - assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class); slicesFeatureProvider = mock(SlicesFeatureProvider.class); mAccountFeatureProvider = mock(AccountFeatureProvider.class); mContextualCardFeatureProvider = mock(ContextualCardFeatureProvider.class); @@ -214,11 +211,6 @@ public class FakeFeatureFactory extends FeatureFactory { return userFeatureProvider; } - @Override - public AssistGestureFeatureProvider getAssistGestureFeatureProvider() { - return assistGestureFeatureProvider; - } - @Override public SlicesFeatureProvider getSlicesFeatureProvider() { return slicesFeatureProvider;