From 59f901861b6985c77fccbe107133a439faa456a5 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Sat, 24 Jun 2017 14:16:47 -0700 Subject: [PATCH] Remove unnecessary functions from AssistGestureFeatureProvider Fixes: 62945918 Test: make -j RunSettingsRoboTests && manual Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e --- .../settings/gestures/AssistGestureFeatureProvider.java | 3 --- .../settings/gestures/AssistGestureFeatureProviderImpl.java | 5 ----- src/com/android/settings/gestures/AssistGestureSettings.java | 3 +-- .../android/settings/gestures/AssistGestureSettingsTest.java | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java index 3016143ff44..bc87ffea9e6 100644 --- a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java +++ b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java @@ -32,9 +32,6 @@ public interface AssistGestureFeatureProvider { /** Returns true if the sensor is available. */ boolean isSensorAvailable(Context context); - /** Returns the resource */ - int getPreferenceResourceId(); - /** 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 index 87cba610b1c..187b1cabb4a 100644 --- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java +++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java @@ -37,11 +37,6 @@ public class AssistGestureFeatureProviderImpl implements AssistGestureFeaturePro return false; } - @Override - public int getPreferenceResourceId() { - return R.xml.assist_gesture_settings; - } - @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 index 77b4dedd2d1..72213925685 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -49,8 +49,7 @@ public class AssistGestureSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return FeatureFactory.getFactory(getContext()) - .getAssistGestureFeatureProvider().getPreferenceResourceId(); + return R.xml.assist_gesture_settings; } @Override diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 6ce3a00693d..1ed030fe4bc 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -58,7 +58,6 @@ public class AssistGestureSettingsTest { @Test public void testGetPreferenceScreenResId() { - when(mFeatureProvider.getPreferenceResourceId()).thenReturn(R.xml.assist_gesture_settings); assertThat(mSettings.getPreferenceScreenResId()) .isEqualTo(R.xml.assist_gesture_settings); } @@ -77,7 +76,6 @@ public class AssistGestureSettingsTest { ShadowApplication.getInstance().getApplicationContext(), true /* enabled */); - when(mFeatureProvider.getPreferenceResourceId()).thenReturn(R.xml.assist_gesture_settings); assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId()); }