Merge "Add ColorDisplayManager" (c1d607e9) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/ColorDisplayManager.java

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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 android.hardware.display;

		import android.content.Context;

		import com.android.internal.R;

		/**
		* Manages the display's color transforms and modes.
		* @hide
		*/
		public final class ColorDisplayManager {

		/**
		* Returns {@code true} if Night Display is supported by the device.
		*/
		public static boolean isNightDisplayAvailable(Context context) {
		return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);
		}
		}

core/java/com/android/internal/app/ColorDisplayController.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -559,13 +559,6 @@ public final class ColorDisplayController {
		return mMetricsLogger;
		}

		/**
		* Returns {@code true} if Night display is supported by the device.
		*/
		public static boolean isAvailable(Context context) {
		return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);
		}

		/**
		* Callback invoked whenever the Night display settings are changed.
		*/

packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_
		import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.content.Intent;
		import android.hardware.display.ColorDisplayManager;
		import android.metrics.LogMaker;
		import android.provider.Settings;
		import android.service.quicksettings.Tile;
		@@ -54,7 +55,6 @@ public class NightDisplayTile extends QSTileImpl<BooleanState>
		private static final String PATTERN_HOUR_MINUTE = "h:mm a";
		private static final String PATTERN_HOUR_NINUTE_24 = "HH:mm";


		private ColorDisplayController mController;
		private boolean mIsListening;

		@@ -65,7 +65,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState>

		@Override
		public boolean isAvailable() {
		return ColorDisplayController.isAvailable(mContext);
		return ColorDisplayManager.isNightDisplayAvailable(mContext);
		}

		@Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		package com.android.systemui.statusbar.phone;

		import android.content.Context;
		import android.hardware.display.ColorDisplayManager;
		import android.os.Handler;
		import android.provider.Settings.Secure;

		@@ -81,7 +82,7 @@ public class AutoTileManager {
		Dependency.get(ManagedProfileController.class).addCallback(mProfileCallback);
		}
		if (!mAutoTracker.isAdded(NIGHT)
		&& ColorDisplayController.isAvailable(mContext)) {
		&& ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		Dependency.get(ColorDisplayController.class).setListener(mColorDisplayCallback);
		}
		}
		@@ -94,8 +95,10 @@ public class AutoTileManager {
		Dependency.get(HotspotController.class).removeCallback(mHotspotCallback);
		Dependency.get(DataSaverController.class).removeCallback(mDataSaverListener);
		Dependency.get(ManagedProfileController.class).removeCallback(mProfileCallback);
		if (ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		Dependency.get(ColorDisplayController.class).setListener(null);
		}
		}

		public void unmarkTileAsAutoAdded(String tabSpec) {
		mAutoTracker.setTileRemoved(tabSpec);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -19,22 +19,22 @@ package com.android.systemui.statusbar.phone;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;

		import android.hardware.display.ColorDisplayManager;
		import android.os.Handler;
		import android.support.test.filters.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.testing.TestableLooper.RunWithLooper;

		import com.android.internal.app.ColorDisplayController;
		import com.android.systemui.Dependency;
		import com.android.systemui.Prefs;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.qs.AutoAddTracker;
		import com.android.systemui.qs.QSTileHost;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.Mockito;
		import org.mockito.MockitoAnnotations;

		@RunWith(AndroidTestingRunner.class)
		@@ -56,7 +56,7 @@ public class AutoTileManagerTest extends SysuiTestCase {

		@Test
		public void nightTileAdded_whenActivated() {
		if (!ColorDisplayController.isAvailable(mContext)) {
		if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		return;
		}
		mAutoTileManager.mColorDisplayCallback.onActivated(true);
		@@ -65,7 +65,7 @@ public class AutoTileManagerTest extends SysuiTestCase {

		@Test
		public void nightTileNotAdded_whenDeactivated() {
		if (!ColorDisplayController.isAvailable(mContext)) {
		if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		return;
		}
		mAutoTileManager.mColorDisplayCallback.onActivated(false);
		@@ -74,7 +74,7 @@ public class AutoTileManagerTest extends SysuiTestCase {

		@Test
		public void nightTileAdded_whenNightModeTwilight() {
		if (!ColorDisplayController.isAvailable(mContext)) {
		if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		return;
		}
		mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(
		@@ -84,7 +84,7 @@ public class AutoTileManagerTest extends SysuiTestCase {

		@Test
		public void nightTileAdded_whenNightModeCustom() {
		if (!ColorDisplayController.isAvailable(mContext)) {
		if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		return;
		}
		mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(
		@@ -94,7 +94,7 @@ public class AutoTileManagerTest extends SysuiTestCase {

		@Test
		public void nightTileNotAdded_whenNightModeDisabled() {
		if (!ColorDisplayController.isAvailable(mContext)) {
		if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
		return;
		}
		mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(