From d87e6c069914a6706dbde911c108abf8c29b0f60 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Fri, 5 Feb 2021 17:33:51 +0000 Subject: [PATCH] Move BrightnessSynchronizer to a display-specific folder. Bug: 159210246 Test: manual Change-Id: Idbd9a1affd8db66d13f5dd8f173d0e2d557e24d8 --- .../android/internal/{ => display}/BrightnessSynchronizer.java | 2 +- core/java/com/android/internal/display/OWNERS | 3 +++ .../systemui/settings/brightness/BrightnessController.java | 2 +- .../android/server/display/AutomaticBrightnessController.java | 2 +- .../com/android/server/display/BrightnessMappingStrategy.java | 2 +- .../java/com/android/server/display/DisplayDeviceConfig.java | 2 +- .../java/com/android/server/display/DisplayDeviceInfo.java | 2 +- .../java/com/android/server/display/DisplayManagerService.java | 2 +- .../com/android/server/display/DisplayPowerController.java | 2 +- .../java/com/android/server/display/DisplayPowerState.java | 2 +- .../java/com/android/server/display/LocalDisplayAdapter.java | 2 +- .../core/java/com/android/server/display/RampAnimator.java | 2 +- .../core/java/com/android/server/lights/LightsService.java | 2 +- .../java/com/android/server/power/PowerManagerService.java | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) rename core/java/com/android/internal/{ => display}/BrightnessSynchronizer.java (99%) create mode 100644 core/java/com/android/internal/display/OWNERS diff --git a/core/java/com/android/internal/BrightnessSynchronizer.java b/core/java/com/android/internal/display/BrightnessSynchronizer.java similarity index 99% rename from core/java/com/android/internal/BrightnessSynchronizer.java rename to core/java/com/android/internal/display/BrightnessSynchronizer.java index 9049ca56bc53f..fae58622d91e0 100644 --- a/core/java/com/android/internal/BrightnessSynchronizer.java +++ b/core/java/com/android/internal/display/BrightnessSynchronizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal; +package com.android.internal.display; import android.content.ContentResolver; diff --git a/core/java/com/android/internal/display/OWNERS b/core/java/com/android/internal/display/OWNERS new file mode 100644 index 0000000000000..20b75be9f11f7 --- /dev/null +++ b/core/java/com/android/internal/display/OWNERS @@ -0,0 +1,3 @@ +include /services/core/java/com/android/server/display/OWNERS + +flc@google.com diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java index 43bb34380f807..0bfc8e5d554b9 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java @@ -41,7 +41,7 @@ import android.service.vr.IVrStateCallbacks; import android.util.Log; import android.util.MathUtils; -import com.android.internal.BrightnessSynchronizer; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtilsInternal; diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index fa063b223250b..225da7ad87b36 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -42,8 +42,8 @@ import android.util.MathUtils; import android.util.Slog; import android.util.TimeUtils; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.os.BackgroundThread; import com.android.server.EventLogTags; import com.android.server.display.DisplayDeviceConfig.HighBrightnessModeData; diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index 4832e46be8a82..a62f67a743adf 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -28,8 +28,8 @@ import android.util.Pair; import android.util.Slog; import android.util.Spline; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.util.Preconditions; import com.android.server.display.utils.Plog; diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index d6872217eab61..1b25427adf71b 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -23,8 +23,8 @@ import android.os.PowerManager; import android.util.Slog; import android.view.DisplayAddress; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.R; +import com.android.internal.display.BrightnessSynchronizer; import com.android.server.display.config.DisplayConfiguration; import com.android.server.display.config.DisplayQuirks; import com.android.server.display.config.HbmTiming; diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java index bf16a6d5efb9c..501533d535d3a 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java +++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java @@ -26,7 +26,7 @@ import android.view.DisplayEventReceiver; import android.view.RoundedCorners; import android.view.Surface; -import com.android.internal.BrightnessSynchronizer; +import com.android.internal.display.BrightnessSynchronizer; import java.util.Arrays; import java.util.Objects; diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 01fee56454753..dce6375ab73cc 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -106,9 +106,9 @@ import android.view.DisplayInfo; import android.view.Surface; import android.view.SurfaceControl; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.server.AnimationThread; diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 2df336528939b..9320f5027ce01 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -53,8 +53,8 @@ import android.util.Slog; import android.util.TimeUtils; import android.view.Display; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.app.IBatteryStats; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.LocalServices; diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index 173adce00cd92..1d20d878fb818 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -26,7 +26,7 @@ import android.util.Slog; import android.view.Choreographer; import android.view.Display; -import com.android.internal.BrightnessSynchronizer; +import com.android.internal.display.BrightnessSynchronizer; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 73ebb2e480379..3b66236c9f0f9 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -38,7 +38,7 @@ import android.view.DisplayEventReceiver; import android.view.RoundedCorners; import android.view.SurfaceControl; -import com.android.internal.BrightnessSynchronizer; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.os.BackgroundThread; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.LocalServices; diff --git a/services/core/java/com/android/server/display/RampAnimator.java b/services/core/java/com/android/server/display/RampAnimator.java index 7916d816dc9b7..26004a8da1a13 100644 --- a/services/core/java/com/android/server/display/RampAnimator.java +++ b/services/core/java/com/android/server/display/RampAnimator.java @@ -20,7 +20,7 @@ import android.animation.ValueAnimator; import android.util.FloatProperty; import android.view.Choreographer; -import com.android.internal.BrightnessSynchronizer; +import com.android.internal.display.BrightnessSynchronizer; /** * A custom animator that progressively updates a property value at diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java index 43c965dde27b9..42b0add6136e9 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -36,9 +36,9 @@ import android.provider.Settings; import android.util.Slog; import android.util.SparseArray; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.util.DumpUtils; import com.android.internal.util.Preconditions; import com.android.server.SystemService; diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 8e0d632dd1a8c..88fdc4aad5cfe 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -90,11 +90,11 @@ import android.util.proto.ProtoOutputStream; import android.view.Display; import android.view.KeyEvent; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IAppOpsService; import com.android.internal.app.IBatteryStats; +import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.os.BackgroundThread; import com.android.internal.util.DumpUtils; import com.android.internal.util.Preconditions;