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

Commit 0e393d41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev

parents 1eb2f153 cd236f7e

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<PreferenceController> 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<PreferenceController> 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
@@ -57,7 +57,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);

    }
@@ -76,7 +75,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());

    }