From 7f0cc14af8708ed94e7defe3fb26e18fa40c5c3e Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Tue, 1 Feb 2022 16:55:43 +0000 Subject: [PATCH] Replace hard-coded bedtime action with Settings.ACTION_BEDTIME_SETTINGS Test: atest SettingsRoboTests:com.android.settings.display.darkmode.* Bug: 216645903 Change-Id: I3c3a00fa53528056538ab1ae34c011b4b44b3fdf --- .../android/settings/display/darkmode/BedtimeSettings.java | 6 ++---- .../android/settings/testutils/BedtimeSettingsUtils.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/display/darkmode/BedtimeSettings.java b/src/com/android/settings/display/darkmode/BedtimeSettings.java index 9714afac80e..d9a458c8798 100644 --- a/src/com/android/settings/display/darkmode/BedtimeSettings.java +++ b/src/com/android/settings/display/darkmode/BedtimeSettings.java @@ -16,19 +16,17 @@ package com.android.settings.display.darkmode; +import static android.provider.Settings.ACTION_BEDTIME_SETTINGS; + import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; /** Manages Digital Wellbeing bedtime settings' intents. */ public final class BedtimeSettings { - @VisibleForTesting - public static final String ACTION_BEDTIME_SETTINGS = "android.settings.BEDTIME_SETTINGS"; - private final Context mContext; private final PackageManager mPackageManager; private final String mWellbeingPackage; diff --git a/tests/robotests/src/com/android/settings/testutils/BedtimeSettingsUtils.java b/tests/robotests/src/com/android/settings/testutils/BedtimeSettingsUtils.java index 6c1d3c2cf6b..59c501b3e36 100644 --- a/tests/robotests/src/com/android/settings/testutils/BedtimeSettingsUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BedtimeSettingsUtils.java @@ -16,7 +16,7 @@ package com.android.settings.testutils; -import static com.android.settings.display.darkmode.BedtimeSettings.ACTION_BEDTIME_SETTINGS; +import static android.provider.Settings.ACTION_BEDTIME_SETTINGS; import static org.robolectric.Shadows.shadowOf;