diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index a3cff3da3d4..6a9e9fc2f7c 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -16,11 +16,11 @@ package com.android.settings.display; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.core.TogglePreferenceController; public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 5c19ca7f732..daaf7b15f14 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -17,6 +17,7 @@ import static android.provider.Settings.Secure.DOZE_ENABLED; import android.app.settings.SettingsEnums; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; @@ -24,7 +25,6 @@ import android.text.TextUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 9f0a613424b..4abf09af120 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -21,14 +21,13 @@ import static android.provider.Settings.Secure.DOZE_DOUBLE_TAP_GESTURE; import android.annotation.UserIdInt; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; import androidx.annotation.VisibleForTesting; -import com.android.internal.hardware.AmbientDisplayConfiguration; - public class DoubleTapScreenPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 81225042b4f..300ce487a3e 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -19,9 +19,9 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.SearchIndexableResource; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index c41d3c63e2a..db402cc04d9 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -18,9 +18,9 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.SearchIndexableResource; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 9366a159817..98eddffb8fa 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.gestures; import android.content.ContentResolver; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.Settings; import androidx.annotation.NonNull; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 7619b69621a..0738a51f0ff 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -21,12 +21,11 @@ import static android.provider.Settings.Secure.DOZE_PICK_UP_GESTURE; import android.annotation.UserIdInt; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.hardware.AmbientDisplayConfiguration; - public class PickupGesturePreferenceController extends GesturePreferenceController { private static final int ON = 1; diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 6d479027bf0..f1cc3f05ed9 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -19,9 +19,9 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.SearchIndexableResource; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; diff --git a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java index bbffc7cdab7..ba2b86973fe 100644 --- a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java +++ b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java @@ -20,12 +20,11 @@ import static android.provider.Settings.Secure.DOZE_TAP_SCREEN_GESTURE; import android.annotation.UserIdInt; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.hardware.AmbientDisplayConfiguration; - public class TapScreenGesturePreferenceController extends GesturePreferenceController { private static final String PREF_KEY_VIDEO = "gesture_tap_screen_video"; diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java index d80c03d8f78..a86e6820afd 100644 --- a/src/com/android/settings/gestures/TapScreenGestureSettings.java +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -18,9 +18,9 @@ package com.android.settings.gestures; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.SearchIndexableResource; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java b/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java index 96a3580e699..e9d03d716ac 100644 --- a/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java +++ b/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java @@ -20,12 +20,12 @@ import static android.provider.Settings.Secure.DOZE_WAKE_SCREEN_GESTURE; import android.annotation.UserIdInt; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 1935f05ef81..3472d4802ab 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -18,11 +18,11 @@ package com.android.settings.security; import android.app.settings.SettingsEnums; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index f8e0a74b8c2..7cd5a232713 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.provider.Settings; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index e36b3947625..fbfb8a493fb 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -29,12 +29,12 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; import androidx.preference.SwitchPreference; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 52cb75d8fe3..0dc7a78999a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index 5422eabc053..b2ba216830f 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.SharedPreferences; +import android.hardware.display.AmbientDisplayConfiguration; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java index c09e4ebe011..12715fd8aa1 100644 --- a/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java @@ -25,8 +25,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; - -import com.android.internal.hardware.AmbientDisplayConfiguration; +import android.hardware.display.AmbientDisplayConfiguration; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java index ecda5fd4386..471914af614 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java @@ -28,8 +28,8 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; import android.content.Context; +import android.hardware.display.AmbientDisplayConfiguration; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory;