Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c091873 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Move BrightnessSynchronizer to a display-specific folder." into sc-dev am: 1a6f0cda 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13497065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie285660b409d9c0ecf61e55e90d0e120ac7f7958
parents e933592f 1a6f0cda

core/java/com/android/internal/BrightnessSynchronizer.java→core/java/com/android/internal/display/BrightnessSynchronizer.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal;

package com.android.internal.display;





import android.content.ContentResolver;

core/java/com/android/internal/display/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
include /services/core/java/com/android/server/display/OWNERS



flc@google.com

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/display/AutomaticBrightnessController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/display/BrightnessMappingStrategy.java

+1 −1
Original line number Diff line number Diff line
@@ -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;