Remove unnecessary functions from AssistGestureFeatureProvider
Fixes: 62945918 Test: make -j RunSettingsRoboTests && manual Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
This commit is contained in:
@@ -32,9 +32,6 @@ public interface AssistGestureFeatureProvider {
|
|||||||
/** Returns true if the sensor is available. */
|
/** Returns true if the sensor is available. */
|
||||||
boolean isSensorAvailable(Context context);
|
boolean isSensorAvailable(Context context);
|
||||||
|
|
||||||
/** Returns the resource */
|
|
||||||
int getPreferenceResourceId();
|
|
||||||
|
|
||||||
/** Returns a list of additional preference controllers */
|
/** Returns a list of additional preference controllers */
|
||||||
List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle);
|
List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle);
|
||||||
|
|
||||||
|
@@ -37,11 +37,6 @@ public class AssistGestureFeatureProviderImpl implements AssistGestureFeaturePro
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getPreferenceResourceId() {
|
|
||||||
return R.xml.assist_gesture_settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle) {
|
public List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle) {
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
|
@@ -49,8 +49,7 @@ public class AssistGestureSettings extends DashboardFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getPreferenceScreenResId() {
|
protected int getPreferenceScreenResId() {
|
||||||
return FeatureFactory.getFactory(getContext())
|
return R.xml.assist_gesture_settings;
|
||||||
.getAssistGestureFeatureProvider().getPreferenceResourceId();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -58,7 +58,6 @@ public class AssistGestureSettingsTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetPreferenceScreenResId() {
|
public void testGetPreferenceScreenResId() {
|
||||||
when(mFeatureProvider.getPreferenceResourceId()).thenReturn(R.xml.assist_gesture_settings);
|
|
||||||
assertThat(mSettings.getPreferenceScreenResId())
|
assertThat(mSettings.getPreferenceScreenResId())
|
||||||
.isEqualTo(R.xml.assist_gesture_settings);
|
.isEqualTo(R.xml.assist_gesture_settings);
|
||||||
}
|
}
|
||||||
@@ -77,7 +76,6 @@ public class AssistGestureSettingsTest {
|
|||||||
ShadowApplication.getInstance().getApplicationContext(),
|
ShadowApplication.getInstance().getApplicationContext(),
|
||||||
true /* enabled */);
|
true /* enabled */);
|
||||||
|
|
||||||
when(mFeatureProvider.getPreferenceResourceId()).thenReturn(R.xml.assist_gesture_settings);
|
|
||||||
assertThat(indexRes).isNotNull();
|
assertThat(indexRes).isNotNull();
|
||||||
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
|
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user