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

Commit 3b30cbee authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Add ambient notifications as inline setting." into oc-dr1-dev 

am: 3bd56d97

Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
parents a9fc19e3 3bd56d97

src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java

+20 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
package com.android.settings.display;



import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;
@@ -21,8 +22,12 @@ import android.support.v14.preference.SwitchPreference; 
import android.support.v7.preference.Preference;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;

import com.android.settings.core.PreferenceController;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.search.DatabaseIndexingUtils;

import com.android.settings.search.InlineSwitchPayload;

import com.android.settings.search.ResultPayload;



import static android.provider.Settings.Secure.DOZE_ENABLED;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
@@ -30,6 +35,9 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION 
public class AmbientDisplayNotificationsPreferenceController extends PreferenceController

        implements Preference.OnPreferenceChangeListener {



    private final int ON = 1;

    private final int OFF = 0;



    @VisibleForTesting

    static final String KEY_AMBIENT_DISPLAY_NOTIFICATIONS = "ambient_display_notification";

    private static final int MY_USER = UserHandle.myUserId();
@@ -65,7 +73,7 @@ public class AmbientDisplayNotificationsPreferenceController extends PreferenceC 
    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        boolean value = (Boolean) newValue;

        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? 1 : 0);

        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? ON : OFF);

        return true;

    }
@@ -73,4 +81,15 @@ public class AmbientDisplayNotificationsPreferenceController extends PreferenceC 
    public boolean isAvailable() {

        return mConfig.pulseOnNotificationAvailable();

    }



    @Override

    public ResultPayload getResultPayload() {

        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,

                AmbientDisplaySettings.class.getName(), KEY_AMBIENT_DISPLAY_NOTIFICATIONS,

                mContext.getString(R.string.ambient_display_screen_title));



        return new InlineSwitchPayload(Settings.Secure.DOZE_ENABLED,

                ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),

                ON /* defaultValue */);

    }

}

tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { 
        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0);



        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);

        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, -1);

        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 1);



        assertThat(updatedValue).isEqualTo(newValue);

    }

tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java

+33 −0
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;



import android.content.ContentResolver;

import android.content.Context;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.search.InlinePayload;

import com.android.settings.search.InlineSwitchPayload;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -133,4 +136,34 @@ public class AmbientDisplayNotificationsPreferenceControllerTest { 


        verifyNoMoreInteractions(mMetricsFeatureProvider);

    }



    @Test

    public void testPreferenceController_ProperResultPayloadType() {

        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);

    }



    @Test

    @Config(shadows = ShadowSecureSettings.class)

    public void testSetValue_updatesCorrectly() {

        int newValue = 1;

        ContentResolver resolver = mContext.getContentResolver();

        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, 0);



        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);

        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ENABLED, 1);



        assertThat(updatedValue).isEqualTo(newValue);

    }



    @Test

    @Config(shadows = ShadowSecureSettings.class)

    public void testGetValue_correctValueReturned() {

        int currentValue = 1;

        ContentResolver resolver = mContext.getContentResolver();

        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, currentValue);



        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);



        assertThat(newValue).isEqualTo(currentValue);

    }

}