Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c7294e authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary functions from AssistGestureFeatureProvider"

parents 60b71f53 59f90186

src/com/android/settings/gestures/AssistGestureFeatureProvider.java

+0 −3
Original line number Diff line number Diff line
@@ -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<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle);

src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ public class AssistGestureFeatureProviderImpl implements AssistGestureFeaturePro 
        return false;

    }



    @Override

    public int getPreferenceResourceId() {

        return R.xml.assist_gesture_settings;

    }



    @Override

    public List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle) {

        return new ArrayList<>();

src/com/android/settings/gestures/AssistGestureSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java

+0 −2
Original line number Diff line number Diff line
@@ -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());

    }