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

Commit 94b265ff authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Fix availability status for AOD gestures" into pi-dev 

am: 39f98e90

Change-Id: Iea6cab0934634ec124eb8e792d84ae06386ad03c
parents 4bc1985a 39f98e90

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

+13 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.support.v7.preference.Preference;

import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;
@@ -74,7 +75,18 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro 
        if (mAmbientConfig == null) {

            mAmbientConfig = new AmbientDisplayConfiguration(mContext);

        }

        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;



        // No hardware support for Double Tap

        if (!mAmbientConfig.doubleTapSensorAvailable()) {

            return UNSUPPORTED_ON_DEVICE;

        }



        // Can't change Double Tap when AOD is enabled.

        if (!mAmbientConfig.ambientDisplayAvailable()) {

            return DISABLED_DEPENDENT_SETTING;

        }



        return AVAILABLE;

    }



    @Override

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

+13 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.SharedPreferences; 
import android.os.UserHandle;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;
@@ -68,7 +69,18 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll 
        if (mAmbientConfig == null) {

            mAmbientConfig = new AmbientDisplayConfiguration(mContext);

        }

        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;



        // No hardware support for Pickup Gesture

        if (!mAmbientConfig.dozePulsePickupSensorAvailable()) {

            return UNSUPPORTED_ON_DEVICE;

        }



        // Can't change Pickup Gesture when AOD is enabled.

        if (!mAmbientConfig.ambientDisplayAvailable()) {

            return DISABLED_DEPENDENT_SETTING;

        }



        return AVAILABLE;

    }



    @Override

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

+31 −14
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.settings.gestures;



import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.when;
@@ -60,20 +64,6 @@ public class DoubleTapScreenPreferenceControllerTest { 
        mController.setConfig(mAmbientDisplayConfiguration);

    }



    @Test

    public void isAvailable_configIsTrue_shouldReturnTrue() {

        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);



        assertThat(mController.isAvailable()).isTrue();

    }



    @Test

    public void isAvailable_configIsFalse_shouldReturnFalse() {

        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void testIsChecked_configIsSet_shouldReturnTrue() {

        // Set the setting to be enabled.
@@ -162,4 +152,31 @@ public class DoubleTapScreenPreferenceControllerTest { 
        when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(false);

        assertThat(mController.canHandleClicks()).isTrue();

    }



    @Test

    public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {

        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(false);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {

        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);

    }



    @Test

    public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {

        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(AVAILABLE);

    }

}

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

+31 −14
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.settings.gestures;



import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doReturn;
@@ -61,20 +65,6 @@ public class PickupGesturePreferenceControllerTest { 
        mController.setConfig(mAmbientDisplayConfiguration);

    }



    @Test

    public void isAvailable_configIsTrue_shouldReturnTrue() {

        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);



        assertThat(mController.isAvailable()).isTrue();

    }



    @Test

    public void isAvailable_configIsFalse_shouldReturnFalse() {

        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(false);



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void testIsChecked_configIsSet_shouldReturnTrue() {

        // Set the setting to be enabled.
@@ -153,4 +143,31 @@ public class PickupGesturePreferenceControllerTest { 
        assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))

                .isTrue();

    }



    @Test

    public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {

        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(false);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {

        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);

    }



    @Test

    public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {

        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);

        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);

        final int availabilityStatus = mController.getAvailabilityStatus();



        assertThat(availabilityStatus).isEqualTo(AVAILABLE);

    }

}