diff options
13 files changed, 104 insertions, 106 deletions
diff --git a/config/compiled-classes-phone b/config/compiled-classes-phone index c91c932ed6c9..947a4f13f6ff 100644 --- a/config/compiled-classes-phone +++ b/config/compiled-classes-phone @@ -5206,6 +5206,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 @@ -5231,8 +5233,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 diff --git a/config/preloaded-classes b/config/preloaded-classes index a9e90de91cfc..784c3f8782ee 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -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 diff --git a/core/java/com/android/internal/app/NightDisplayController.java b/core/java/com/android/internal/app/ColorDisplayController.java index b8bfc6491f70..b8682a89eb95 100644 --- a/core/java/com/android/internal/app/NightDisplayController.java +++ b/core/java/com/android/internal/app/ColorDisplayController.java @@ -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; diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 1c2e5a406772..7cc43a7b2715 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 62a9319cf8aa..e7e70afa20ce 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -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)); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index 4c2036141daf..763ffc677bc2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -22,8 +22,7 @@ import android.provider.Settings; import android.service.quicksettings.Tile; import android.widget.Switch; -import com.android.internal.app.NightDisplayController; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSHost; @@ -31,19 +30,19 @@ import com.android.systemui.plugins.qs.QSTile.BooleanState; import com.android.systemui.qs.tileimpl.QSTileImpl; public class NightDisplayTile extends QSTileImpl<BooleanState> - implements NightDisplayController.Callback { + implements ColorDisplayController.Callback { - private NightDisplayController mController; + private ColorDisplayController mController; private boolean mIsListening; public NightDisplayTile(QSHost host) { super(host); - mController = new NightDisplayController(mContext, ActivityManager.getCurrentUser()); + mController = new ColorDisplayController(mContext, ActivityManager.getCurrentUser()); } @Override public boolean isAvailable() { - return NightDisplayController.isAvailable(mContext); + return ColorDisplayController.isAvailable(mContext); } @Override @@ -65,7 +64,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> } // Make a new controller for the new user. - mController = new NightDisplayController(mContext, newUserId); + mController = new ColorDisplayController(mContext, newUserId); if (mIsListening) { mController.setListener(this); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java index 1bd90fa9ca08..149ec0b3a56a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java @@ -20,7 +20,7 @@ import android.os.Looper; import android.provider.Settings.Secure; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import com.android.systemui.Dependency; import com.android.systemui.Prefs; import com.android.systemui.Prefs.Key; @@ -78,8 +78,8 @@ public class AutoTileManager { } if (!mAutoTracker.isAdded(NIGHT) - && NightDisplayController.isAvailable(mContext)) { - Dependency.get(NightDisplayController.class).setListener(mNightDisplayCallback); + && ColorDisplayController.isAvailable(mContext)) { + Dependency.get(ColorDisplayController.class).setListener(mColorDisplayCallback); } } @@ -89,7 +89,7 @@ public class AutoTileManager { Dependency.get(HotspotController.class).removeCallback(mHotspotCallback); Dependency.get(DataSaverController.class).removeCallback(mDataSaverListener); Dependency.get(ManagedProfileController.class).removeCallback(mProfileCallback); - Dependency.get(NightDisplayController.class).setListener(null); + Dependency.get(ColorDisplayController.class).setListener(null); } private final ManagedProfileController.Callback mProfileCallback = @@ -139,8 +139,8 @@ public class AutoTileManager { }; @VisibleForTesting - final NightDisplayController.Callback mNightDisplayCallback = - new NightDisplayController.Callback() { + final ColorDisplayController.Callback mColorDisplayCallback = + new ColorDisplayController.Callback() { @Override public void onActivated(boolean activated) { if (activated) { @@ -150,8 +150,8 @@ public class AutoTileManager { @Override public void onAutoModeChanged(int autoMode) { - if (autoMode == NightDisplayController.AUTO_MODE_CUSTOM - || autoMode == NightDisplayController.AUTO_MODE_TWILIGHT) { + if (autoMode == ColorDisplayController.AUTO_MODE_CUSTOM + || autoMode == ColorDisplayController.AUTO_MODE_TWILIGHT) { addNightTile(); } } @@ -160,7 +160,7 @@ public class AutoTileManager { if (mAutoTracker.isAdded(NIGHT)) return; mHost.addTile(NIGHT); mAutoTracker.setTileAdded(NIGHT); - mHandler.post(() -> Dependency.get(NightDisplayController.class) + mHandler.post(() -> Dependency.get(ColorDisplayController.class) .setListener(null)); } }; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java index 3b401a5d9b0c..a95e3dbb1e3b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java @@ -24,7 +24,7 @@ import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import com.android.systemui.Dependency; import com.android.systemui.Prefs; import com.android.systemui.Prefs.Key; @@ -61,49 +61,49 @@ public class AutoTileManagerTest extends SysuiTestCase { @Test public void nightTileAdded_whenActivated() { - if (!NightDisplayController.isAvailable(mContext)) { + if (!ColorDisplayController.isAvailable(mContext)) { return; } - mAutoTileManager.mNightDisplayCallback.onActivated(true); + mAutoTileManager.mColorDisplayCallback.onActivated(true); verify(mQsTileHost).addTile("night"); } @Test public void nightTileNotAdded_whenDeactivated() { - if (!NightDisplayController.isAvailable(mContext)) { + if (!ColorDisplayController.isAvailable(mContext)) { return; } - mAutoTileManager.mNightDisplayCallback.onActivated(false); + mAutoTileManager.mColorDisplayCallback.onActivated(false); verify(mQsTileHost, never()).addTile("night"); } @Test public void nightTileAdded_whenNightModeTwilight() { - if (!NightDisplayController.isAvailable(mContext)) { + if (!ColorDisplayController.isAvailable(mContext)) { return; } - mAutoTileManager.mNightDisplayCallback.onAutoModeChanged( - NightDisplayController.AUTO_MODE_TWILIGHT); + mAutoTileManager.mColorDisplayCallback.onAutoModeChanged( + ColorDisplayController.AUTO_MODE_TWILIGHT); verify(mQsTileHost).addTile("night"); } @Test public void nightTileAdded_whenNightModeCustom() { - if (!NightDisplayController.isAvailable(mContext)) { + if (!ColorDisplayController.isAvailable(mContext)) { return; } - mAutoTileManager.mNightDisplayCallback.onAutoModeChanged( - NightDisplayController.AUTO_MODE_CUSTOM); + mAutoTileManager.mColorDisplayCallback.onAutoModeChanged( + ColorDisplayController.AUTO_MODE_CUSTOM); verify(mQsTileHost).addTile("night"); } @Test public void nightTileNotAdded_whenNightModeDisabled() { - if (!NightDisplayController.isAvailable(mContext)) { + if (!ColorDisplayController.isAvailable(mContext)) { return; } - mAutoTileManager.mNightDisplayCallback.onAutoModeChanged( - NightDisplayController.AUTO_MODE_DISABLED); + mAutoTileManager.mColorDisplayCallback.onAutoModeChanged( + ColorDisplayController.AUTO_MODE_DISABLED); verify(mQsTileHost, never()).addTile("night"); } } diff --git a/services/art-profile b/services/art-profile index ac5ecaff2cc4..301918fbe1c8 100644 --- a/services/art-profile +++ b/services/art-profile @@ -2374,6 +2374,9 @@ HPLcom/android/server/display/AutomaticBrightnessController;->nextAmbientLightDa HPLcom/android/server/display/AutomaticBrightnessController;->updateAmbientLux()V HPLcom/android/server/display/AutomaticBrightnessController;->updateAmbientLux(J)V HPLcom/android/server/display/AutomaticBrightnessController;->weightIntegral(J)F +HPLcom/android/server/display/ColorDisplayService$3;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V +HPLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;->evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +HPLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;->evaluate(F[F[F)[F HPLcom/android/server/display/DisplayBlanker;->requestDisplayState(II)V HPLcom/android/server/display/DisplayManagerService$BinderService;->getDisplayIds()[I HPLcom/android/server/display/DisplayManagerService$CallbackRecord;->binderDied()V @@ -2430,9 +2433,6 @@ HPLcom/android/server/display/DisplayTransformManager;->setColorMatrix(I[F)V HPLcom/android/server/display/LogicalDisplay;->getRequestedModeIdLocked()I HPLcom/android/server/display/LogicalDisplay;->hasContentLocked()Z HPLcom/android/server/display/LogicalDisplay;->setDisplayInfoOverrideFromWindowManagerLocked(Landroid/view/DisplayInfo;)Z -HPLcom/android/server/display/NightDisplayService$3;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V -HPLcom/android/server/display/NightDisplayService$ColorMatrixEvaluator;->evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; -HPLcom/android/server/display/NightDisplayService$ColorMatrixEvaluator;->evaluate(F[F[F)[F HPLcom/android/server/display/RampAnimator$1;->run()V HPLcom/android/server/display/RampAnimator$Listener;->onAnimationEnd()V HPLcom/android/server/display/RampAnimator;->-get0(Lcom/android/server/display/RampAnimator;)F @@ -10133,6 +10133,25 @@ PLcom/android/server/display/AutomaticBrightnessController;->setAmbientLux(F)V PLcom/android/server/display/AutomaticBrightnessController;->setLightSensorEnabled(Z)Z PLcom/android/server/display/AutomaticBrightnessController;->setScreenAutoBrightnessAdjustment(F)Z PLcom/android/server/display/AutomaticBrightnessController;->updateAutoBrightness(Z)V +PLcom/android/server/display/ColorDisplayService$1;-><init>(Lcom/android/server/display/ColorDisplayService;)V +PLcom/android/server/display/ColorDisplayService$3;-><init>(Lcom/android/server/display/ColorDisplayService;Lcom/android/server/display/DisplayTransformManager;)V +PLcom/android/server/display/ColorDisplayService$4;-><init>(Lcom/android/server/display/ColorDisplayService;Lcom/android/server/display/DisplayTransformManager;[F)V +PLcom/android/server/display/ColorDisplayService$4;->onAnimationCancel(Landroid/animation/Animator;)V +PLcom/android/server/display/ColorDisplayService$4;->onAnimationEnd(Landroid/animation/Animator;)V +PLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;-><init>()V +PLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;-><init>(Lcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;)V +PLcom/android/server/display/ColorDisplayService;->-set0(Lcom/android/server/display/ColorDisplayService;Landroid/animation/ValueAnimator;)Landroid/animation/ValueAnimator; +PLcom/android/server/display/ColorDisplayService;-><init>(Landroid/content/Context;)V +PLcom/android/server/display/ColorDisplayService;->applyTint(Z)V +PLcom/android/server/display/ColorDisplayService;->isUserSetupCompleted(Landroid/content/ContentResolver;I)Z +PLcom/android/server/display/ColorDisplayService;->onActivated(Z)V +PLcom/android/server/display/ColorDisplayService;->onAutoModeChanged(I)V +PLcom/android/server/display/ColorDisplayService;->onBootPhase(I)V +PLcom/android/server/display/ColorDisplayService;->onStart()V +PLcom/android/server/display/ColorDisplayService;->onStartUser(I)V +PLcom/android/server/display/ColorDisplayService;->onUserChanged(I)V +PLcom/android/server/display/ColorDisplayService;->setMatrix(I[F)V +PLcom/android/server/display/ColorDisplayService;->setUp()V PLcom/android/server/display/ColorFade;-><init>(I)V PLcom/android/server/display/ColorFade;->createNativeFloatBuffer(I)Ljava/nio/FloatBuffer; PLcom/android/server/display/ColorFade;->dismiss()V @@ -10230,25 +10249,6 @@ PLcom/android/server/display/LogicalDisplay;->configureDisplayInTransactionLocke PLcom/android/server/display/LogicalDisplay;->getDisplayIdLocked()I PLcom/android/server/display/LogicalDisplay;->getNonOverrideDisplayInfoLocked(Landroid/view/DisplayInfo;)V PLcom/android/server/display/LogicalDisplay;->setHasContentLocked(Z)V -PLcom/android/server/display/NightDisplayService$1;-><init>(Lcom/android/server/display/NightDisplayService;)V -PLcom/android/server/display/NightDisplayService$3;-><init>(Lcom/android/server/display/NightDisplayService;Lcom/android/server/display/DisplayTransformManager;)V -PLcom/android/server/display/NightDisplayService$4;-><init>(Lcom/android/server/display/NightDisplayService;Lcom/android/server/display/DisplayTransformManager;[F)V -PLcom/android/server/display/NightDisplayService$4;->onAnimationCancel(Landroid/animation/Animator;)V -PLcom/android/server/display/NightDisplayService$4;->onAnimationEnd(Landroid/animation/Animator;)V -PLcom/android/server/display/NightDisplayService$ColorMatrixEvaluator;-><init>()V -PLcom/android/server/display/NightDisplayService$ColorMatrixEvaluator;-><init>(Lcom/android/server/display/NightDisplayService$ColorMatrixEvaluator;)V -PLcom/android/server/display/NightDisplayService;->-set0(Lcom/android/server/display/NightDisplayService;Landroid/animation/ValueAnimator;)Landroid/animation/ValueAnimator; -PLcom/android/server/display/NightDisplayService;-><init>(Landroid/content/Context;)V -PLcom/android/server/display/NightDisplayService;->applyTint(Z)V -PLcom/android/server/display/NightDisplayService;->isUserSetupCompleted(Landroid/content/ContentResolver;I)Z -PLcom/android/server/display/NightDisplayService;->onActivated(Z)V -PLcom/android/server/display/NightDisplayService;->onAutoModeChanged(I)V -PLcom/android/server/display/NightDisplayService;->onBootPhase(I)V -PLcom/android/server/display/NightDisplayService;->onStart()V -PLcom/android/server/display/NightDisplayService;->onStartUser(I)V -PLcom/android/server/display/NightDisplayService;->onUserChanged(I)V -PLcom/android/server/display/NightDisplayService;->setMatrix(I[F)V -PLcom/android/server/display/NightDisplayService;->setUp()V PLcom/android/server/display/OverlayDisplayAdapter$1$1;-><init>(Lcom/android/server/display/OverlayDisplayAdapter$1;Landroid/os/Handler;)V PLcom/android/server/display/OverlayDisplayAdapter$1;-><init>(Lcom/android/server/display/OverlayDisplayAdapter;)V PLcom/android/server/display/OverlayDisplayAdapter$1;->run()V diff --git a/services/core/java/com/android/server/display/NightDisplayService.java b/services/core/java/com/android/server/display/ColorDisplayService.java index a7c3ff9e0104..af8ecadd3c97 100644 --- a/services/core/java/com/android/server/display/NightDisplayService.java +++ b/services/core/java/com/android/server/display/ColorDisplayService.java @@ -42,7 +42,7 @@ import android.util.MathUtils; import android.util.Slog; import android.view.animation.AnimationUtils; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import com.android.server.SystemService; import com.android.server.twilight.TwilightListener; import com.android.server.twilight.TwilightManager; @@ -60,10 +60,10 @@ import static com.android.server.display.DisplayTransformManager.LEVEL_COLOR_MAT /** * Tints the display at night. */ -public final class NightDisplayService extends SystemService - implements NightDisplayController.Callback { +public final class ColorDisplayService extends SystemService + implements ColorDisplayController.Callback { - private static final String TAG = "NightDisplayService"; + private static final String TAG = "ColorDisplayService"; /** * The transition time, in milliseconds, for Night Display to turn on/off. @@ -119,12 +119,12 @@ public final class NightDisplayService extends SystemService private ContentObserver mUserSetupObserver; private boolean mBootCompleted; - private NightDisplayController mController; + private ColorDisplayController mController; private ValueAnimator mColorMatrixAnimator; private Boolean mIsActivated; private AutoMode mAutoMode; - public NightDisplayService(Context context) { + public ColorDisplayService(Context context) { super(context); mHandler = new Handler(Looper.getMainLooper()); } @@ -228,7 +228,7 @@ public final class NightDisplayService extends SystemService Slog.d(TAG, "setUp: currentUser=" + mCurrentUser); // Create a new controller for the current user and start listening for changes. - mController = new NightDisplayController(getContext(), mCurrentUser); + mController = new ColorDisplayController(getContext(), mCurrentUser); mController.setListener(this); setCoefficientMatrix(getContext()); @@ -293,9 +293,9 @@ public final class NightDisplayService extends SystemService mAutoMode = null; } - if (autoMode == NightDisplayController.AUTO_MODE_CUSTOM) { + if (autoMode == ColorDisplayController.AUTO_MODE_CUSTOM) { mAutoMode = new CustomAutoMode(); - } else if (autoMode == NightDisplayController.AUTO_MODE_TWILIGHT) { + } else if (autoMode == ColorDisplayController.AUTO_MODE_TWILIGHT) { mAutoMode = new TwilightAutoMode(); } @@ -463,7 +463,7 @@ public final class NightDisplayService extends SystemService return ldt.isBefore(compareTime) ? ldt.plusDays(1) : ldt; } - private abstract class AutoMode implements NightDisplayController.Callback { + private abstract class AutoMode implements ColorDisplayController.Callback { public abstract void onStart(); public abstract void onStop(); diff --git a/services/core/java/com/android/server/display/DisplayTransformManager.java b/services/core/java/com/android/server/display/DisplayTransformManager.java index bef6898a4ecf..338e3311fe3b 100644 --- a/services/core/java/com/android/server/display/DisplayTransformManager.java +++ b/services/core/java/com/android/server/display/DisplayTransformManager.java @@ -29,7 +29,7 @@ import android.util.Slog; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import java.util.Arrays; /** @@ -223,13 +223,13 @@ public class DisplayTransformManager { } public boolean setColorMode(int colorMode) { - if (colorMode == NightDisplayController.COLOR_MODE_NATURAL) { + if (colorMode == ColorDisplayController.COLOR_MODE_NATURAL) { applySaturation(COLOR_SATURATION_NATURAL); setNativeMode(false); - } else if (colorMode == NightDisplayController.COLOR_MODE_BOOSTED) { + } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) { applySaturation(COLOR_SATURATION_BOOSTED); setNativeMode(false); - } else if (colorMode == NightDisplayController.COLOR_MODE_SATURATED) { + } else if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) { applySaturation(COLOR_SATURATION_NATURAL); setNativeMode(true); } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f8bcb73a8f83..47594685de34 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -37,7 +37,6 @@ import android.os.Looper; import android.os.Message; import android.os.PowerManager; import android.os.Process; -import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemClock; @@ -52,7 +51,7 @@ import android.util.Slog; import android.view.WindowManager; import com.android.internal.R; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.MetricsLogger; import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.os.BinderInternal; @@ -69,7 +68,7 @@ import com.android.server.connectivity.IpConnectivityMetrics; import com.android.server.coverage.CoverageService; import com.android.server.devicepolicy.DevicePolicyManagerService; import com.android.server.display.DisplayManagerService; -import com.android.server.display.NightDisplayService; +import com.android.server.display.ColorDisplayService; import com.android.server.dreams.DreamManagerService; import com.android.server.emergency.EmergencyAffordanceService; import com.android.server.fingerprint.FingerprintService; @@ -1277,9 +1276,9 @@ public final class SystemServer { mSystemServiceManager.startService(TwilightService.class); traceEnd(); - if (NightDisplayController.isAvailable(context)) { + if (ColorDisplayController.isAvailable(context)) { traceBeginAndSlog("StartNightDisplay"); - mSystemServiceManager.startService(NightDisplayService.class); + mSystemServiceManager.startService(ColorDisplayService.class); traceEnd(); } diff --git a/services/tests/servicestests/src/com/android/server/NightDisplayServiceTest.java b/services/tests/servicestests/src/com/android/server/ColorDisplayServiceTest.java index 3a92d638fb02..46b364c21559 100644 --- a/services/tests/servicestests/src/com/android/server/NightDisplayServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ColorDisplayServiceTest.java @@ -29,10 +29,10 @@ import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import android.test.mock.MockContentResolver; -import com.android.internal.app.NightDisplayController; +import com.android.internal.app.ColorDisplayController; import com.android.internal.util.test.FakeSettingsProvider; import com.android.server.display.DisplayTransformManager; -import com.android.server.display.NightDisplayService; +import com.android.server.display.ColorDisplayService; import com.android.server.twilight.TwilightListener; import com.android.server.twilight.TwilightManager; import com.android.server.twilight.TwilightState; @@ -55,15 +55,15 @@ import static com.google.common.truth.Truth.assertWithMessage; import static org.mockito.Mockito.doReturn; @RunWith(AndroidJUnit4.class) -public class NightDisplayServiceTest { +public class ColorDisplayServiceTest { private Context mContext; private int mUserId; private MockTwilightManager mTwilightManager; - private NightDisplayController mNightDisplayController; - private NightDisplayService mNightDisplayService; + private ColorDisplayController mColorDisplayController; + private ColorDisplayService mColorDisplayService; @Before public void setUp() { @@ -85,8 +85,8 @@ public class NightDisplayServiceTest { mTwilightManager = new MockTwilightManager(); LocalServices.addService(TwilightManager.class, mTwilightManager); - mNightDisplayController = new NightDisplayController(mContext, mUserId); - mNightDisplayService = new NightDisplayService(mContext); + mColorDisplayController = new ColorDisplayController(mContext, mUserId); + mColorDisplayService = new ColorDisplayService(mContext); } @After @@ -94,8 +94,8 @@ public class NightDisplayServiceTest { LocalServices.removeServiceForTest(DisplayTransformManager.class); LocalServices.removeServiceForTest(TwilightManager.class); - mNightDisplayService = null; - mNightDisplayController = null; + mColorDisplayService = null; + mColorDisplayController = null; mTwilightManager = null; @@ -902,9 +902,9 @@ public class NightDisplayServiceTest { * @param endTimeOffset the offset relative to now to deactivate Night display (in minutes) */ private void setAutoModeCustom(int startTimeOffset, int endTimeOffset) { - mNightDisplayController.setAutoMode(NightDisplayController.AUTO_MODE_CUSTOM); - mNightDisplayController.setCustomStartTime(getLocalTimeRelativeToNow(startTimeOffset)); - mNightDisplayController.setCustomEndTime(getLocalTimeRelativeToNow(endTimeOffset)); + mColorDisplayController.setAutoMode(ColorDisplayController.AUTO_MODE_CUSTOM); + mColorDisplayController.setCustomStartTime(getLocalTimeRelativeToNow(startTimeOffset)); + mColorDisplayController.setCustomEndTime(getLocalTimeRelativeToNow(endTimeOffset)); } /** @@ -914,7 +914,7 @@ public class NightDisplayServiceTest { * @param sunriseOffset the offset relative to now for sunrise (in minutes) */ private void setAutoModeTwilight(int sunsetOffset, int sunriseOffset) { - mNightDisplayController.setAutoMode(NightDisplayController.AUTO_MODE_TWILIGHT); + mColorDisplayController.setAutoMode(ColorDisplayController.AUTO_MODE_TWILIGHT); mTwilightManager.setTwilightState( getTwilightStateRelativeToNow(sunsetOffset, sunriseOffset)); } @@ -927,7 +927,7 @@ public class NightDisplayServiceTest { * activated (in minutes) */ private void setActivated(boolean activated, int lastActivatedTimeOffset) { - mNightDisplayController.setActivated(activated); + mColorDisplayController.setActivated(activated); Secure.putStringForUser(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME, LocalDateTime.now().plusMinutes(lastActivatedTimeOffset).toString(), @@ -935,7 +935,7 @@ public class NightDisplayServiceTest { } /** - * Convenience method to start {@link #mNightDisplayService}. + * Convenience method to start {@link #mColorDisplayService}. */ private void startService() { Secure.putIntForUser(mContext.getContentResolver(), Secure.USER_SETUP_COMPLETE, 1, mUserId); @@ -943,9 +943,9 @@ public class NightDisplayServiceTest { InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() { @Override public void run() { - mNightDisplayService.onStart(); - mNightDisplayService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED); - mNightDisplayService.onStartUser(mUserId); + mColorDisplayService.onStart(); + mColorDisplayService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED); + mColorDisplayService.onStartUser(mUserId); } }); } @@ -957,7 +957,7 @@ public class NightDisplayServiceTest { */ private void assertActivated(boolean activated) { assertWithMessage("Invalid Night display activated state") - .that(mNightDisplayController.isActivated()) + .that(mColorDisplayController.isActivated()) .isEqualTo(activated); } @@ -988,21 +988,21 @@ public class NightDisplayServiceTest { final LocalDateTime now = LocalDateTime.now(); final ZoneId zoneId = ZoneId.systemDefault(); - long sunsetMillis = NightDisplayService.getDateTimeBefore(sunset, now) + long sunsetMillis = ColorDisplayService.getDateTimeBefore(sunset, now) .atZone(zoneId) .toInstant() .toEpochMilli(); - long sunriseMillis = NightDisplayService.getDateTimeBefore(sunrise, now) + long sunriseMillis = ColorDisplayService.getDateTimeBefore(sunrise, now) .atZone(zoneId) .toInstant() .toEpochMilli(); if (sunsetMillis < sunriseMillis) { - sunsetMillis = NightDisplayService.getDateTimeAfter(sunset, now) + sunsetMillis = ColorDisplayService.getDateTimeAfter(sunset, now) .atZone(zoneId) .toInstant() .toEpochMilli(); } else { - sunriseMillis = NightDisplayService.getDateTimeAfter(sunrise, now) + sunriseMillis = ColorDisplayService.getDateTimeAfter(sunrise, now) .atZone(zoneId) .toInstant() .toEpochMilli(); |