From 4a5e0e5bc73607488b10132ff584a1ebd56cc066 Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Fri, 7 Apr 2023 19:55:19 +0000 Subject: [PATCH] Update the default wellbeing package config. defaultWellbeingPackage is now deprecated and should not be used. Instead, point all references to the new systemWellbeing config. Bug: 233363529 Test: atest AmbientDisplayAlwaysOnPreferenceControllerTest Test: atest DarkModeCustomBedtimePreferenceControllerTest Test: atest DarkModeScheduleSelectorControllerTest Test: atest WhenToDreamPreferenceControllerTest Change-Id: Ia55ce505c5010e401ec0dc18a2fed41d3a692c7a --- .../display/AmbientDisplayAlwaysOnPreferenceController.java | 2 +- src/com/android/settings/display/darkmode/BedtimeSettings.java | 2 +- .../display/AmbientDisplayAlwaysOnPreferenceControllerTest.java | 2 +- .../darkmode/DarkModeCustomBedtimePreferenceControllerTest.java | 2 +- .../darkmode/DarkModeScheduleSelectorControllerTest.java | 2 +- .../settings/dream/WhenToDreamPreferenceControllerTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index bf81727cca9..e0e25dfc34f 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -121,7 +121,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference final PowerManager powerManager = context.getSystemService(PowerManager.class); final PackageManager packageManager = context.getPackageManager(); final String packageName = context.getString( - com.android.internal.R.string.config_defaultWellbeingPackage); + com.android.internal.R.string.config_systemWellbeing); try { uid = packageManager.getApplicationInfo(packageName, /* flags= */ 0).uid; } catch (PackageManager.NameNotFoundException e) { diff --git a/src/com/android/settings/display/darkmode/BedtimeSettings.java b/src/com/android/settings/display/darkmode/BedtimeSettings.java index 28121b22cfc..5b9b4d235e7 100644 --- a/src/com/android/settings/display/darkmode/BedtimeSettings.java +++ b/src/com/android/settings/display/darkmode/BedtimeSettings.java @@ -37,7 +37,7 @@ public final class BedtimeSettings { mContext = context; mPackageManager = context.getPackageManager(); mWellbeingPackage = mContext.getResources().getString( - com.android.internal.R.string.config_defaultWellbeingPackage); + com.android.internal.R.string.config_systemWellbeing); } /** diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 405ea12abb3..3ad14e53940 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -74,7 +74,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { mController.setConfig(mConfig); mApplicationInfo.uid = 1; - when(mContext.getString(R.string.config_defaultWellbeingPackage)).thenReturn(TEST_PACKAGE); + when(mContext.getString(R.string.config_systemWellbeing)).thenReturn(TEST_PACKAGE); when(mContext.getPackageManager()).thenReturn(mPackageManager); doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo( diff --git a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceControllerTest.java index 7f505688d67..85d6fabd9b1 100644 --- a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceControllerTest.java @@ -77,7 +77,7 @@ public class DarkModeCustomBedtimePreferenceControllerTest { when(mContext.getSystemService(UiModeManager.class)).thenReturn(mService); when(mContext.getResources()).thenReturn(mResources); - when(mResources.getString(com.android.internal.R.string.config_defaultWellbeingPackage)) + when(mResources.getString(com.android.internal.R.string.config_systemWellbeing)) .thenReturn("wellbeing"); when(mScreen.findPreference(anyString())).thenReturn(mFooterPreference); diff --git a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java index d776e5e36c9..d95635e6437 100644 --- a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java @@ -84,7 +84,7 @@ public class DarkModeScheduleSelectorControllerTest { when(mContext.getSystemService(LocationManager.class)).thenReturn(mLocationManager); when(mContext.getResources()).thenReturn(mResources); when(mResources.getConfiguration()).thenReturn(mConfigNightNo); - when(mResources.getString(com.android.internal.R.string.config_defaultWellbeingPackage)) + when(mResources.getString(com.android.internal.R.string.config_systemWellbeing)) .thenReturn("wellbeing"); when(mContext.getString(R.string.dark_ui_auto_mode_never)).thenReturn("never"); diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index 6e687bba7d9..e173add0724 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -72,7 +72,7 @@ public class WhenToDreamPreferenceControllerTest { mApplicationInfo.uid = 1; when(mContext.getString( - com.android.internal.R.string.config_defaultWellbeingPackage)).thenReturn( + com.android.internal.R.string.config_systemWellbeing)).thenReturn( TEST_PACKAGE); when(mContext.getPackageManager()).thenReturn(mPackageManager);