diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 536c00a7075..ccb50ae10ed 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.settings.dashboard.conditional.FocusRecyclerView
+<com.android.settings.homepage.conditional.FocusRecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dashboard_container"
     android:layout_width="match_parent"
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 7e7cf46caf4..f671cf39241 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -40,9 +40,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.R.id;
 import com.android.settings.dashboard.DashboardData.ConditionHeaderData;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionAdapter;
+import com.android.settings.homepage.conditional.Condition;
+import com.android.settings.homepage.conditional.ConditionAdapter;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 182d79b6227..9716ae01075 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -24,7 +24,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.DiffUtil;
 
 import com.android.settings.R;
-import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.homepage.conditional.Condition;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index ec5f7dd4715..9609098ab35 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -36,12 +36,12 @@ import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.core.SettingsBaseActivity.CategoryListener;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionManager;
-import com.android.settings.dashboard.conditional.ConditionManager.ConditionListener;
-import com.android.settings.dashboard.conditional.FocusRecyclerView;
-import com.android.settings.dashboard.conditional.FocusRecyclerView.FocusListener;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.homepage.conditional.Condition;
+import com.android.settings.homepage.conditional.ConditionManager;
+import com.android.settings.homepage.conditional.ConditionManager.ConditionListener;
+import com.android.settings.homepage.conditional.FocusRecyclerView;
+import com.android.settings.homepage.conditional.FocusRecyclerView.FocusListener;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.ActionBarShadowController;
 import com.android.settingslib.drawer.CategoryKey;
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index e2440a517a8..e77393ee8f9 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -22,19 +22,16 @@ import android.os.Looper;
 import android.os.PowerManager;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.dashboard.conditional.BatterySaverCondition;
-import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class BatterySaverController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
     private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
@@ -82,11 +79,6 @@ public class BatterySaverController extends BasePreferenceController
         mBatteryStateChangeReceiver.setListening(false);
     }
 
-    @VisibleForTesting
-    void refreshConditionManager() {
-        ConditionManager.get(mContext).getCondition(BatterySaverCondition.class).refreshState();
-    }
-
     @Override
     public CharSequence getSummary() {
         final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
diff --git a/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java b/src/com/android/settings/homepage/conditional/AbnormalRingerConditionBase.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java
rename to src/com/android/settings/homepage/conditional/AbnormalRingerConditionBase.java
index eaec6d08cc7..ef564feef09 100644
--- a/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java
+++ b/src/com/android/settings/homepage/conditional/AbnormalRingerConditionBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/homepage/conditional/AirplaneModeCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
rename to src/com/android/settings/homepage/conditional/AirplaneModeCondition.java
index 792a090ddf9..9d21e438f7b 100644
--- a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
+++ b/src/com/android/settings/homepage/conditional/AirplaneModeCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/homepage/conditional/BackgroundDataCondition.java
similarity index 97%
rename from src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
rename to src/com/android/settings/homepage/conditional/BackgroundDataCondition.java
index d5372a24c05..84ae9241412 100644
--- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
+++ b/src/com/android/settings/homepage/conditional/BackgroundDataCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/homepage/conditional/BatterySaverCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
rename to src/com/android/settings/homepage/conditional/BatterySaverCondition.java
index b0c1de4edb1..1301b3de252 100644
--- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
+++ b/src/com/android/settings/homepage/conditional/BatterySaverCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/homepage/conditional/CellularDataCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/CellularDataCondition.java
rename to src/com/android/settings/homepage/conditional/CellularDataCondition.java
index bc0cbd5200f..7b382a7cf28 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/homepage/conditional/CellularDataCondition.java
@@ -8,7 +8,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/homepage/conditional/Condition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/Condition.java
rename to src/com/android/settings/homepage/conditional/Condition.java
index 82452ff6f0c..f91e422aa6c 100644
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ b/src/com/android/settings/homepage/conditional/Condition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -22,12 +22,12 @@ import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.os.PersistableBundle;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-import androidx.annotation.VisibleForTesting;
-
 public abstract class Condition {
 
     private static final String KEY_SILENCE = "silence";
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/homepage/conditional/ConditionAdapter.java
similarity index 99%
rename from src/com/android/settings/dashboard/conditional/ConditionAdapter.java
rename to src/com/android/settings/homepage/conditional/ConditionAdapter.java
index a6478e21867..e975146d095 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
+++ b/src/com/android/settings/homepage/conditional/ConditionAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Context;
 import android.util.Log;
@@ -22,6 +22,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
@@ -32,10 +36,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import java.util.List;
 import java.util.Objects;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
 public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> {
     public static final String TAG = "ConditionAdapter";
 
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/homepage/conditional/ConditionManager.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/ConditionManager.java
rename to src/com/android/settings/homepage/conditional/ConditionManager.java
index 2754d8a5e64..e84b71a3d26 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ b/src/com/android/settings/homepage/conditional/ConditionManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -44,7 +44,7 @@ public class ConditionManager implements LifecycleObserver, OnResume, OnPause {
 
     private static final boolean DEBUG = false;
 
-    private static final String PKG = "com.android.settings.dashboard.conditional.";
+    private static final String PKG = "com.android.settings.homepage.conditional.";
 
     private static final String FILE_NAME = "condition_state.xml";
     private static final String TAG_CONDITIONS = "cs";
diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/homepage/conditional/DndCondition.java
similarity index 99%
rename from src/com/android/settings/dashboard/conditional/DndCondition.java
rename to src/com/android/settings/homepage/conditional/DndCondition.java
index 32184e174fc..3e8052b4808 100644
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/homepage/conditional/DndCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
@@ -26,13 +26,13 @@ import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.service.notification.ZenModeConfig;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.ZenModeSettings;
 
-import androidx.annotation.VisibleForTesting;
-
 public class DndCondition extends Condition {
 
     private static final String TAG = "DndCondition";
diff --git a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java b/src/com/android/settings/homepage/conditional/FocusRecyclerView.java
similarity index 96%
rename from src/com/android/settings/dashboard/conditional/FocusRecyclerView.java
rename to src/com/android/settings/homepage/conditional/FocusRecyclerView.java
index abe4743cb3e..78b9eede458 100644
--- a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java
+++ b/src/com/android/settings/homepage/conditional/FocusRecyclerView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/settings/dashboard/conditional/HotspotCondition.java b/src/com/android/settings/homepage/conditional/HotspotCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/HotspotCondition.java
rename to src/com/android/settings/homepage/conditional/HotspotCondition.java
index 68f2382176e..7212e841701 100644
--- a/src/com/android/settings/dashboard/conditional/HotspotCondition.java
+++ b/src/com/android/settings/homepage/conditional/HotspotCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java b/src/com/android/settings/homepage/conditional/NightDisplayCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
rename to src/com/android/settings/homepage/conditional/NightDisplayCondition.java
index c3ba534fd83..95769734713 100644
--- a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
+++ b/src/com/android/settings/homepage/conditional/NightDisplayCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java b/src/com/android/settings/homepage/conditional/RingerMutedCondition.java
similarity index 97%
rename from src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
rename to src/com/android/settings/homepage/conditional/RingerMutedCondition.java
index 7f7bc2be090..740e6e48bab 100644
--- a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
+++ b/src/com/android/settings/homepage/conditional/RingerMutedCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
 
diff --git a/src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java b/src/com/android/settings/homepage/conditional/RingerVibrateCondition.java
similarity index 96%
rename from src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java
rename to src/com/android/settings/homepage/conditional/RingerVibrateCondition.java
index 6af05c1faed..ea91c0ef28b 100644
--- a/src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java
+++ b/src/com/android/settings/homepage/conditional/RingerVibrateCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/homepage/conditional/WorkModeCondition.java
similarity index 98%
rename from src/com/android/settings/dashboard/conditional/WorkModeCondition.java
rename to src/com/android/settings/homepage/conditional/WorkModeCondition.java
index 941d5b02b68..9e467faf446 100644
--- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
+++ b/src/com/android/settings/homepage/conditional/WorkModeCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 8f10af7afec..54e004f9e0d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -45,7 +45,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.homepage.conditional.Condition;
 import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index dfa049446b7..d92cceb62a8 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -33,8 +33,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListUpdateCallback;
 
-import com.android.settings.dashboard.conditional.AirplaneModeCondition;
-import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.homepage.conditional.AirplaneModeCondition;
+import com.android.settings.homepage.conditional.Condition;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index d93cd810caa..4eaeaf23e10 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -30,8 +30,8 @@ import static org.mockito.Mockito.when;
 import android.app.Activity;
 import android.content.Context;
 
-import com.android.settings.dashboard.conditional.ConditionManager;
-import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.homepage.conditional.ConditionManager;
+import com.android.settings.homepage.conditional.FocusRecyclerView;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index ad5537cf2e2..ac93941a7d0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -56,7 +56,6 @@ public class BatterySaverControllerTest {
         mBatterySaverController = spy(new BatterySaverController(mContext));
         ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
         ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
-        doNothing().when(mBatterySaverController).refreshConditionManager();
 
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionBaseTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionBaseTest.java
index c72131fa8e2..efc5ceab889 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionBaseTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionTest.java
index 725be7962d4..289fa7c22ba 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionTest.java
index fa05ae030f6..323e6c5ff91 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionAdapterTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/ConditionAdapterTest.java
index 62d1dfaa6af..663c630f3db 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionAdapterTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -24,6 +25,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardAdapter;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class ConditionAdapterTest {
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/ConditionTest.java
index 6d5673151a2..981ef662ef5 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/DndConditionTest.java
index 29ad60f713b..9da1f9c3bb5 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.never;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/RingerMutedConditionTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/RingerMutedConditionTest.java
index 66ef5a039b3..408aa137891 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/RingerMutedConditionTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionTest.java
index a134fac5721..e886236e209 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionTest.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionTest.java
index 8ba6ecc3188..c846be0f854 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.conditional;
 
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.spy;