Merge "Rename NightDisplayController and -Service" (69dde2ed) · Commits · e / os / android_frameworks_base

config/compiled-classes-phone

+2 −2

Original line number	Diff line number	Diff line
		@@ -5205,6 +5205,8 @@ com.android.internal.app.AlertController$AlertParams$4
		com.android.internal.app.AlertController$ButtonHandler
		com.android.internal.app.AlertController$RecycleListView
		com.android.internal.app.AssistUtils
		com.android.internal.app.ColorDisplayController
		com.android.internal.app.ColorDisplayController$Callback
		com.android.internal.app.IAppOpsCallback
		com.android.internal.app.IAppOpsCallback$Stub
		com.android.internal.app.IAppOpsCallback$Stub$Proxy
		@@ -5230,8 +5232,6 @@ com.android.internal.app.IVoiceInteractionSessionShowCallback
		com.android.internal.app.IVoiceInteractionSessionShowCallback$Stub
		com.android.internal.app.IVoiceInteractor
		com.android.internal.app.IVoiceInteractor$Stub
		com.android.internal.app.NightDisplayController
		com.android.internal.app.NightDisplayController$Callback
		com.android.internal.app.ProcessMap
		com.android.internal.app.ResolverActivity
		com.android.internal.app.ToolbarActionBar

+1 −1

Original line number	Diff line number	Diff line
		@@ -2768,6 +2768,7 @@ com.android.i18n.phonenumbers.ShortNumbersRegionCodeSet
		com.android.ims.ImsException
		com.android.internal.R$styleable
		com.android.internal.app.AlertController$AlertParams
		com.android.internal.app.ColorDisplayController
		com.android.internal.app.IAppOpsCallback
		com.android.internal.app.IAppOpsCallback$Stub
		com.android.internal.app.IAppOpsService
		@@ -2780,7 +2781,6 @@ com.android.internal.app.IVoiceInteractionManagerService
		com.android.internal.app.IVoiceInteractionManagerService$Stub
		com.android.internal.app.IVoiceInteractor
		com.android.internal.app.IVoiceInteractor$Stub
		com.android.internal.app.NightDisplayController
		com.android.internal.appwidget.IAppWidgetService
		com.android.internal.appwidget.IAppWidgetService$Stub
		com.android.internal.appwidget.IAppWidgetService$Stub$Proxy

+5 −5

Original line number	Diff line number	Diff line
		@@ -42,14 +42,14 @@ import java.time.ZoneId;
		import java.time.format.DateTimeParseException;

		/**
		* Controller for managing Night display settings.
		* Controller for managing night display and color mode settings.
		* <p/>
		* Night display tints your screen red at night. This makes it easier to look at your screen in
		* dim light and may help you fall asleep more easily.
		*/
		public final class NightDisplayController {
		public final class ColorDisplayController {

		private static final String TAG = "NightDisplayController";
		private static final String TAG = "ColorDisplayController";
		private static final boolean DEBUG = false;

		@Retention(RetentionPolicy.SOURCE)
		@@ -114,11 +114,11 @@ public final class NightDisplayController {

		private Callback mCallback;

		public NightDisplayController(@NonNull Context context) {
		public ColorDisplayController(@NonNull Context context) {
		this(context, ActivityManager.getCurrentUser());
		}

		public NightDisplayController(@NonNull Context context, int userId) {
		public ColorDisplayController(@NonNull Context context, int userId) {
		mContext = context.getApplicationContext();
		mUserId = userId;

+1 −1

Original line number	Diff line number	Diff line
		@@ -876,7 +876,7 @@
		<bool name="config_nightDisplayAvailable">@bool/config_setColorTransformAccelerated</bool>

		<!-- Default mode to control how Night display is automatically activated.
		One of the following values (see NightDisplayController.java):
		One of the following values (see ColorDisplayController.java):
		0 - AUTO_MODE_DISABLED
		1 - AUTO_MODE_CUSTOM
		2 - AUTO_MODE_TWILIGHT

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.view.IWindowManager;
		import android.view.WindowManagerGlobal;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.app.NightDisplayController;
		import com.android.internal.app.ColorDisplayController;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.util.Preconditions;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		@@ -205,8 +205,8 @@ public class Dependency extends SystemUI {
		mProviders.put(BatteryController.class, () ->
		new BatteryControllerImpl(mContext));

		mProviders.put(NightDisplayController.class, () ->
		new NightDisplayController(mContext));
		mProviders.put(ColorDisplayController.class, () ->
		new ColorDisplayController(mContext));

		mProviders.put(ManagedProfileController.class, () ->
		new ManagedProfileControllerImpl(mContext));