AOD: Fix default for always-on setting (22a905ee) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java

+18 −11

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ public class AmbientDisplayConfiguration {
		}

		public boolean pulseOnNotificationEnabled(int user) {
		return boolSetting(Settings.Secure.DOZE_ENABLED, user) && pulseOnNotificationAvailable();
		return boolSettingDefaultOn(Settings.Secure.DOZE_ENABLED, user) && pulseOnNotificationAvailable();
		}

		public boolean pulseOnNotificationAvailable() {
		@@ -52,7 +52,7 @@ public class AmbientDisplayConfiguration {
		}

		public boolean pulseOnPickupEnabled(int user) {
		return boolSetting(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user)
		return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user)
		&& pulseOnPickupAvailable();
		}

		@@ -62,7 +62,7 @@ public class AmbientDisplayConfiguration {
		}

		public boolean pulseOnDoubleTapEnabled(int user) {
		return boolSetting(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, user)
		return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, user)
		&& pulseOnDoubleTapAvailable();
		}

		@@ -75,7 +75,7 @@ public class AmbientDisplayConfiguration {
		}

		public boolean alwaysOnEnabled(int user) {
		return boolSetting(Settings.Secure.DOZE_ALWAYS_ON, user)
		return boolSettingDefaultOff(Settings.Secure.DOZE_ALWAYS_ON, user)
		&& alwaysOnAvailable();
		}

		@@ -92,8 +92,15 @@ public class AmbientDisplayConfiguration {
		return !TextUtils.isEmpty(ambientDisplayComponent());
		}

		private boolean boolSetting(String name, int user) {
		return Settings.Secure.getIntForUser(mContext.getContentResolver(), name, 1, user) != 0;
		private boolean boolSettingDefaultOn(String name, int user) {
		return boolSetting(name, user, 1);
		}

		private boolean boolSettingDefaultOff(String name, int user) {
		return boolSetting(name, user, 0);
		}

		private boolean boolSetting(String name, int user, int def) {
		return Settings.Secure.getIntForUser(mContext.getContentResolver(), name, def, user) != 0;
		}
		}

packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationTest.java

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.doze;

		import static org.junit.Assert.assertFalse;

		import android.os.UserHandle;
		import android.provider.Settings;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.systemui.SysuiTestCase;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@RunWith(AndroidJUnit4.class)
		@SmallTest
		public class DozeConfigurationTest extends SysuiTestCase {

		private AmbientDisplayConfiguration mDozeConfig;

		@Before
		public void setup() {
		mDozeConfig = new AmbientDisplayConfiguration(mContext);
		}

		@Test
		public void alwaysOn_offByDefault() throws Exception {
		if (!mDozeConfig.alwaysOnAvailable()) {
		return;
		}

		mContext.getSettingsProvider().acquireOverridesBuilder(this)
		.addSetting("secure", Settings.Secure.DOZE_ALWAYS_ON, null)
		.build();

		assertFalse(mDozeConfig.alwaysOnEnabled(UserHandle.USER_CURRENT));
		}
		}