diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6b9c637d2b4..3bd5193f4a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3108,7 +3108,7 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <provider
-            android:name=".homepage.CardContentProvider"
+            android:name=".homepage.contextualcards.CardContentProvider"
             android:authorities="com.android.settings.homepage.CardContentProvider"
             android:exported="true"
             android:permission="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA" />
diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml
deleted file mode 100644
index 877b17a4413..00000000000
--- a/res/layout/condition_container.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/SuggestionConditionStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="16dp"
-    android:paddingStart="14dp"
-    android:paddingEnd="14dp"
-    android:paddingBottom="@dimen/dashboard_padding_bottom">
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardUseCompatPadding="true"
-        app:cardElevation="2dp"
-        app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/data"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbars="none"/>
-
-    </androidx.cardview.widget.CardView>
-
-</FrameLayout>
diff --git a/res/layout/condition_footer.xml b/res/layout/condition_footer.xml
deleted file mode 100644
index 5de9d551194..00000000000
--- a/res/layout/condition_footer.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/SuggestionConditionStyle"
-    android:layout_width="match_parent"
-    android:layout_height="44dp"
-    android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
-    android:gravity="end"
-    android:orientation="horizontal"
-    android:paddingTop="10dp"
-    android:paddingEnd="10dp">
-
-    <ImageView
-        android:id="@+id/collapse_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_expand_less" />
-
-</LinearLayout>
diff --git a/res/layout/condition_header.xml b/res/layout/condition_header.xml
deleted file mode 100644
index e33157e717e..00000000000
--- a/res/layout/condition_header.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/SuggestionConditionStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/condition_header_height"
-        android:layout_centerHorizontal="true">
-
-        <FrameLayout
-            android:id="@android:id/icon_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_centerVertical="true">
-
-            <include layout="@layout/condition_header_icon" />
-
-        </FrameLayout>
-
-        <ImageView
-            android:id="@+id/expand_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingTop="4dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:src="@drawable/ic_expand_more"/>
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_toStartOf="@id/expand_indicator"
-            android:layout_centerVertical="true"
-            android:gravity="end"
-            android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:textColor="?android:attr/colorAccent" />
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@android:id/icon_frame"
-            android:layout_toStartOf="@android:id/summary"
-            android:layout_centerVertical="true"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <LinearLayout
-            android:id="@+id/additional_icons"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_toStartOf="@android:id/summary"
-            android:layout_toEndOf="@android:id/icon_frame"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"/>
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/condition_header_icon.xml b/res/layout/condition_header_icon.xml
deleted file mode 100644
index 79fe54e8287..00000000000
--- a/res/layout/condition_header_icon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/icon"
-    android:layout_width="@dimen/suggestion_card_icon_size"
-    android:layout_height="@dimen/suggestion_card_icon_size"
-    android:layout_marginStart="0dp"
-    android:layout_marginEnd="24dp"
-    android:tint="?android:attr/colorAccent" />
diff --git a/res/layout/condition_tile.xml b/res/layout/condition_tile.xml
deleted file mode 100644
index 1ca5839b0a3..00000000000
--- a/res/layout/condition_tile.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/condition_header_height"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/suggestion_card_icon_size"
-            android:layout_height="@dimen/suggestion_card_icon_size"
-            android:layout_marginTop="12dp"
-            android:layout_marginStart="14dp"
-            android:layout_marginEnd="24dp"
-            android:tint="?android:attr/colorAccent"/>
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="62dp"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingBottom="8dp"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:alpha=".7"
-        android:textColor="?android:attr/textColorPrimary"/>
-
-    <androidx.appcompat.widget.ButtonBarLayout
-        android:id="@+id/buttonBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="62dp"
-        android:paddingBottom="1dp"
-        style="?android:attr/buttonBarStyle"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-        <Button
-            android:id="@+id/first_action"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingStart="0dp"
-            android:alpha=".8"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            style="?android:attr/buttonBarButtonStyle"/>
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-    </androidx.appcompat.widget.ButtonBarLayout>
-
-    <include layout="@layout/horizontal_divider"/>
-
-</LinearLayout>
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
deleted file mode 100644
index 8031028d8c6..00000000000
--- a/res/layout/dashboard.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<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"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:focusable="false"
-    android:paddingStart="@dimen/dashboard_padding_start"
-    android:paddingEnd="@dimen/dashboard_padding_end"
-    android:paddingTop="@dimen/dashboard_padding_top"
-    android:paddingBottom="@dimen/dashboard_padding_bottom"
-    android:scrollbars="vertical"/>
\ No newline at end of file
diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml
deleted file mode 100644
index 3ebcb099d71..00000000000
--- a/res/layout/dashboard_spacer.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<View
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="8dp"
-    android:background="?android:attr/colorSecondary"/>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
deleted file mode 100644
index e35dbff8d52..00000000000
--- a/res/layout/dashboard_tile.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dashboard_tile"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:minHeight="@dimen/dashboard_tile_minimum_height"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/dashboard_tile_image_size"
-        android:layout_height="@dimen/dashboard_tile_image_size"
-        android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.TileTitle"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-        <TextView android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.Small"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:paddingEnd="@dimen/dashboard_tile_image_margin" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/headerless_preference_category.xml b/res/layout/headerless_preference_category.xml
deleted file mode 100644
index cddc44572d1..00000000000
--- a/res/layout/headerless_preference_category.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<!-- Style for a preference category without a header title.
-     Based on tall_preference_category, but invisible and with some 0dp attributes. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/title"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_marginBottom="0dip"
-    android:textAppearance="@android:style/TextAppearance.Material.Body2"
-    android:textColor="?android:attr/colorAccent"
-    android:paddingBottom="8dp"
-    android:paddingTop="16dip"
-    android:visible="false" />
diff --git a/res/layout/homepage_condition_tile.xml b/res/layout/homepage_condition_tile.xml
index 9be5c1efdf4..ed760948cfa 100644
--- a/res/layout/homepage_condition_tile.xml
+++ b/res/layout/homepage_condition_tile.xml
@@ -16,11 +16,82 @@
 
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/ContextualCardStyle">
 
-    <include layout="@layout/condition_tile"/>
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/condition_header_height"
+            android:background="?android:attr/selectableItemBackground"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="@dimen/suggestion_card_icon_size"
+                android:layout_height="@dimen/suggestion_card_icon_size"
+                android:layout_marginTop="12dp"
+                android:layout_marginStart="14dp"
+                android:layout_marginEnd="24dp"
+                android:tint="?android:attr/colorAccent"/>
+
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimary"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="62dp"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:paddingBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:alpha=".7"
+            android:textColor="?android:attr/textColorPrimary"/>
+
+        <androidx.appcompat.widget.ButtonBarLayout
+            android:id="@+id/buttonBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="62dp"
+            android:paddingBottom="1dp"
+            style="?android:attr/buttonBarStyle"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+            <Button
+                android:id="@+id/first_action"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingStart="0dp"
+                android:alpha=".8"
+                android:textAlignment="viewStart"
+                android:textColor="?android:attr/textColorPrimary"
+                style="?android:attr/buttonBarButtonStyle"/>
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+        </androidx.appcompat.widget.ButtonBarLayout>
+
+        <include layout="@layout/horizontal_divider"/>
+
+    </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/res/layout/search_icon_view.xml b/res/layout/search_icon_view.xml
deleted file mode 100644
index aa0bf024adc..00000000000
--- a/res/layout/search_icon_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
-  -->
-
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/icon"
-    android:layout_width="@dimen/dashboard_tile_foreground_image_size"
-    android:layout_height="match_parent"
-    android:scaleType="centerInside"
-    android:layout_marginStart="@dimen/dashboard_tile_image_margin"
-    android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
deleted file mode 100644
index 6de344debbe..00000000000
--- a/res/layout/search_main.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright 2016, The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_content"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"/>
diff --git a/res/layout/search_slice_item.xml b/res/layout/search_slice_item.xml
deleted file mode 100644
index 1607209228f..00000000000
--- a/res/layout/search_slice_item.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
-
-    <include layout="@layout/search_icon_view"/>
-
-    <android.app.slice.widget.SliceView
-        android:id="@android:id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/settings_data_plan_summary_preference.xml b/res/layout/settings_data_plan_summary_preference.xml
deleted file mode 100644
index e8874745b1c..00000000000
--- a/res/layout/settings_data_plan_summary_preference.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at"+
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="@dimen/preference_no_icon_padding_start"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:orientation="horizontal">
-
-    <!-- Shows the data plan usage in chart -->
-    <com.android.settings.widget.DonutView
-            android:id="@+id/donut"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_marginEnd="8dp"
-            android:layout_gravity="center"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:gravity="end|center_vertical"
-            settings:applyColorAccent="false"
-            settings:showPercentString="false"
-            settings:thickness="6dp"/>
-
-    <LinearLayout
-            android:id="@+id/data_plan_row"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="2dp"
-            android:orientation="vertical">
-
-        <!-- Shows the data plan usage -->
-        <TextView
-                android:id="@android:id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:paddingTop="0dp"
-                android:fontFamily="@*android:string/config_headlineFontFamily"
-                android:textAppearance="@android:style/TextAppearance.Material.Title"/>
-
-        <!-- Shows the data plan name -->
-        <TextView
-                android:id="@android:id/text1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="5dp"
-                android:maxLines="3"
-                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-        <!-- Shows the data plan description -->
-        <TextView
-                android:id="@android:id/text2"
-                android:textStyle="italic"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="5"
-                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                android:textColor="?android:attr/textColorSecondary"/>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
index 78ec39f8416..5e0adec71ac 100644
--- a/res/layout/settings_homepage_container.xml
+++ b/res/layout/settings_homepage_container.xml
@@ -29,7 +29,7 @@
         <include layout="@layout/search_bar"/>
 
         <FrameLayout
-            android:id="@+id/suggestion_content"
+            android:id="@+id/contextual_cards_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
diff --git a/res/layout/suggestion_container.xml b/res/layout/suggestion_container.xml
deleted file mode 100644
index 3f57c336a0d..00000000000
--- a/res/layout/suggestion_container.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/SuggestionConditionStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="2dp"
-    android:orientation="vertical">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/suggestion_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:scrollbars="none"/>
-
-</LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
deleted file mode 100644
index 09431a806c7..00000000000
--- a/res/layout/suggestion_tile.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/suggestion_card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true"
-    app:cardElevation="2dp"
-    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="112dp"
-        android:paddingBottom="8dp"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@android:id/icon"
-                android:layout_width="@dimen/suggestion_card_icon_size"
-                android:layout_height="@dimen/suggestion_card_icon_size"
-                style="@style/SuggestionCardIcon"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="6dp" />
-
-
-            <FrameLayout
-                android:id="@+id/close_button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:orientation="horizontal"
-                android:contentDescription="@string/dlg_close">
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:layout_gravity="end|top"
-                    android:alpha="0.54"
-                    android:src="@drawable/ic_suggestion_close_button"/>
-            </FrameLayout>
-
-        </RelativeLayout>
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/SuggestionCardText"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:fadingEdge="horizontal" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/SuggestionCardText"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.SuggestionSummary" />
-
-    </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/suggestion_tile_two_cards.xml b/res/layout/suggestion_tile_two_cards.xml
deleted file mode 100644
index c75458b68b8..00000000000
--- a/res/layout/suggestion_tile_two_cards.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/suggestion_card"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true"
-    app:cardElevation="2dp"
-    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="112dp"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@android:id/icon"
-                android:layout_width="@dimen/suggestion_card_icon_size"
-                android:layout_height="@dimen/suggestion_card_icon_size"
-                style="@style/SuggestionCardIcon"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp" />
-
-            <FrameLayout
-                android:id="@+id/close_button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:gravity="end|top"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:orientation="horizontal"
-                android:contentDescription="@string/dlg_close">
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:layout_gravity="end|top"
-                    android:alpha="0.54"
-                    android:src="@drawable/ic_suggestion_close_button"/>
-            </FrameLayout>
-
-        </RelativeLayout>
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="@style/SuggestionCardText"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="16dp"
-            android:gravity="center_vertical"
-            android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:maxLines="3"
-            android:ellipsize="end"
-            android:fadingEdge="horizontal" />
-
-    </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
deleted file mode 100644
index 7d59dd9978d..00000000000
--- a/res/layout/suggestion_tile_with_button.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/suggestion_card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true"
-    app:cardElevation="2dp"
-    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="160dp"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@android:id/icon"
-                android:layout_width="@dimen/suggestion_card_icon_size"
-                android:layout_height="@dimen/suggestion_card_icon_size"
-                style="@style/SuggestionCardIcon"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="6dp" />
-
-            <FrameLayout
-                android:id="@+id/close_button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:orientation="horizontal"
-                android:contentDescription="@string/dlg_close">
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:layout_gravity="end|top"
-                    android:alpha="0.54"
-                    android:src="@drawable/ic_suggestion_close_button"/>
-            </FrameLayout>
-
-        </RelativeLayout>
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/SuggestionCardText"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:fadingEdge="horizontal" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/SuggestionCardText"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.SuggestionSummary" />
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/SuggestionCardButton">
-            <Button
-                android:id="@android:id/primary"
-                style="@style/ActionPrimaryButton"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/suggestion_button_text" />
-        </FrameLayout>
-
-    </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/system_info_list_item.xml b/res/layout/system_info_list_item.xml
deleted file mode 100644
index 37806bd2111..00000000000
--- a/res/layout/system_info_list_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:paddingStart="?android:attr/dialogPreferredPadding"
-    android:paddingEnd="?android:attr/dialogPreferredPadding"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"/>
-    <TextView
-        android:id="@+id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_alignStart="@id/title"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"
-        android:maxLines="4"/>
-</LinearLayout>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index b1ec4c73716..7f707d271a7 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -17,10 +17,6 @@
 <resources>
     <dimen name="settings_side_margin">112dp</dimen>
 
-    <!-- Dashboard padding in its container -->
-    <dimen name="dashboard_padding_start">160dp</dimen>
-    <dimen name="dashboard_padding_end">160dp</dimen>
-
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">128dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index ec4e22f311c..6accad7a84c 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -31,18 +31,6 @@
     <dimen name="actionbar_contentInsetStart">80dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
 
-    <!-- Dashboard margins between each tiles within the layout -->
-    <dimen name="dashboard_cell_gap_x">24dp</dimen>
-    <dimen name="dashboard_cell_gap_y">0dp</dimen>
-
-    <!-- Dashboard padding in its container -->
-    <dimen name="dashboard_padding_start">80dp</dimen>
-    <dimen name="dashboard_padding_end">80dp</dimen>
-
-    <!-- Dashboard category padding start / end -->
-    <dimen name="dashboard_category_padding_start">24dp</dimen>
-    <dimen name="dashboard_category_padding_end">24dp</dimen>
-
     <!-- SwitchBar sub settings margin start / end -->
     <dimen name="switchbar_subsettings_margin_start">80dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">80dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dc39475d66e..805909746aa 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -79,19 +79,6 @@
     <dimen name="actionbar_contentInsetStart">16dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
 
-    <!-- Dashboard padding in its container -->
-    <dimen name="dashboard_padding_start">0dp</dimen>
-    <dimen name="dashboard_padding_end">0dp</dimen>
-    <dimen name="dashboard_padding_top">0dp</dimen>
-    <dimen name="dashboard_padding_bottom">0dp</dimen>
-
-    <!-- Dashboard category padding start / end -->
-    <dimen name="dashboard_category_padding_start">0dp</dimen>
-    <dimen name="dashboard_category_padding_end">0dp</dimen>
-
-    <!-- Dashboard tile minimum height -->
-    <dimen name="dashboard_tile_minimum_height">72dp</dimen>
-
     <!-- Dashboard image tile size -->
     <dimen name="dashboard_tile_image_size">36dp</dimen>
 
@@ -101,9 +88,6 @@
     <!-- Dashboard foreground image inset (from background edge to foreground edge) -->
     <dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
 
-    <!-- Dashboard tile image margin start / end -->
-    <dimen name="dashboard_tile_image_margin">18dp</dimen>
-
     <!-- SwitchBar sub settings margin start / end -->
     <dimen name="switchbar_subsettings_margin_start">72dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">16dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13698679d2a..f18ec41e4c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,9 +25,6 @@
     <!-- Strings for Dialog deny button -->
     <string name="deny">Deny</string>
 
-    <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
-    <string name="dlg_close">Close</string>
-
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -6871,9 +6868,6 @@
         <item quantity="other">Show %d hidden items</item>
     </plurals>
 
-    <!-- Content description for suggestion footer button. Double tapping will cause suggestion list to collapse [CHAR LIMIT=NONE]-->
-    <string name="dashboard_suggestion_condition_footer_content_description">Collapse</string>
-
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
     <string name="network_dashboard_title">Network &amp; internet</string>
     <!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 440f7d02c01..fa7b1d7db5f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -333,10 +333,6 @@
         <item name="android:padding">8dp</item>
     </style>
 
-    <style name="SuggestionConditionStyle">
-        <item name="android:background">?android:attr/colorPrimary</item>
-    </style>
-
     <style name="SuggestionCardText">
         <item name="android:textAlignment">viewStart</item>
     </style>
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index ba18b1ff564..cbde0cad8de 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -75,7 +75,7 @@
 
     <PreferenceCategory
         android:key="uri_category"
-        android:layout="@layout/headerless_preference_category"
+        android:layout="@layout/preference_category_no_label"
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="false">
         <com.android.settings.applications.LayoutPreference
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index da7e7f2ee16..b3d1aa43ff5 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -29,13 +29,11 @@ import androidx.fragment.app.FragmentTransaction;
 import com.android.settings.R;
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SettingsBaseActivity;
+import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
 import com.android.settings.overlay.FeatureFactory;
 
 public class SettingsHomepageActivity extends SettingsBaseActivity {
 
-    private static final String SUGGESTION_TAG = "suggestion";
-    private static final String MAIN_TAG = "main";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -54,21 +52,21 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
         FeatureFactory.getFactory(this).getSearchFeatureProvider()
                 .initSearchToolbar(this, toolbar);
 
-        showFragment(new PersonalSettingsFragment(), R.id.suggestion_content, SUGGESTION_TAG);
-        showFragment(new TopLevelSettings(), R.id.main_content, MAIN_TAG);
+        showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+        showFragment(new TopLevelSettings(), R.id.main_content);
     }
 
     public static boolean isDynamicHomepageEnabled(Context context) {
         return FeatureFlagUtils.isEnabled(context, FeatureFlags.DYNAMIC_HOMEPAGE);
     }
 
-    private void showFragment(Fragment fragment, int id, String tag) {
+    private void showFragment(Fragment fragment, int id) {
         final FragmentManager fragmentManager = getSupportFragmentManager();
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         final Fragment showFragment = fragmentManager.findFragmentById(id);
 
         if (showFragment == null) {
-            fragmentTransaction.add(id, fragment, tag);
+            fragmentTransaction.add(id, fragment);
         } else {
             fragmentTransaction.show(showFragment);
         }
diff --git a/src/com/android/settings/homepage/conditional/FocusRecyclerView.java b/src/com/android/settings/homepage/conditional/FocusRecyclerView.java
deleted file mode 100644
index 78b9eede458..00000000000
--- a/src/com/android/settings/homepage/conditional/FocusRecyclerView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.homepage.conditional;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Version of RecyclerView that can have listeners for onWindowFocusChanged.
- */
-public class FocusRecyclerView extends RecyclerView {
-
-    private FocusListener mListener;
-
-    public FocusRecyclerView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasWindowFocus) {
-        super.onWindowFocusChanged(hasWindowFocus);
-        if (mListener != null) {
-            mListener.onWindowFocusChanged(hasWindowFocus);
-        }
-    }
-
-    public void setListener(FocusListener listener) {
-        mListener = listener;
-    }
-
-    public interface FocusListener {
-        void onWindowFocusChanged(boolean hasWindowFocus);
-    }
-}
diff --git a/src/com/android/settings/homepage/CardContentProvider.java b/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
similarity index 95%
rename from src/com/android/settings/homepage/CardContentProvider.java
rename to src/com/android/settings/homepage/contextualcards/CardContentProvider.java
index 99894459adf..74e09e8d467 100644
--- a/src/com/android/settings/homepage/CardContentProvider.java
+++ b/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -41,14 +41,12 @@ public class CardContentProvider extends ContentProvider {
     public static final String CARD_AUTHORITY = "com.android.settings.homepage.CardContentProvider";
 
     /** URI matcher for ContentProvider queries. */
-    private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+    private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
     /** URI matcher type for cards table */
     private static final int MATCH_CARDS = 100;
-    /** URI matcher type for card log table */
-    private static final int MATCH_CARD_LOG = 200;
 
     static {
-        sUriMatcher.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
+        URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
     }
 
     private CardDatabaseHelper mDBHelper;
@@ -170,7 +168,7 @@ public class CardContentProvider extends ContentProvider {
 
     @VisibleForTesting
     String getTableFromMatch(Uri uri) {
-        final int match = sUriMatcher.match(uri);
+        final int match = URI_MATCHER.match(uri);
         String table;
         switch (match) {
             case MATCH_CARDS:
diff --git a/src/com/android/settings/homepage/CardDatabaseHelper.java b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java
similarity index 99%
rename from src/com/android/settings/homepage/CardDatabaseHelper.java
rename to src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java
index 53de44185e7..11ab8d8c125 100644
--- a/src/com/android/settings/homepage/CardDatabaseHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/android/settings/homepage/ContextualCard.java b/src/com/android/settings/homepage/contextualcards/ContextualCard.java
similarity index 99%
rename from src/com/android/settings/homepage/ContextualCard.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCard.java
index bb83836fc1d..996c2dd11d2 100644
--- a/src/com/android/settings/homepage/ContextualCard.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.annotation.IntDef;
 import android.database.Cursor;
diff --git a/src/com/android/settings/homepage/ContextualCardController.java b/src/com/android/settings/homepage/contextualcards/ContextualCardController.java
similarity index 94%
rename from src/com/android/settings/homepage/ContextualCardController.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardController.java
index e47f70ce397..95669cecd42 100644
--- a/src/com/android/settings/homepage/ContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 /**
  * Data controller for {@link ContextualCard}.
diff --git a/src/com/android/settings/homepage/CardContentLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
similarity index 67%
rename from src/com/android/settings/homepage/CardContentLoader.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index 7168b676690..bc1d0fa2fd4 100644
--- a/src/com/android/settings/homepage/CardContentLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static android.app.slice.Slice.HINT_ERROR;
 
@@ -32,17 +32,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.slice.Slice;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
-    private static final String TAG = "CardContentLoader";
+public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
+    private static final String TAG = "ContextualCardLoader";
     static final int CARD_CONTENT_LOADER_ID = 1;
 
     private Context mContext;
@@ -51,7 +51,7 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
         void onFinishCardLoading(List<ContextualCard> contextualCards);
     }
 
-    CardContentLoader(Context context) {
+    ContextualCardLoader(Context context) {
         super(context);
         mContext = context.getApplicationContext();
     }
@@ -79,7 +79,7 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
                 }
             }
         }
-        return filter(result);
+        return filterEligibleCards(result);
     }
 
     @VisibleForTesting
@@ -92,42 +92,41 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
         final long appVersionCode = getAppVersionCode();
         final String packageName = mContext.getPackageName();
         final double rankingScore = 0.0;
-        final List<ContextualCard> result = new ArrayList() {{
-            add(new ContextualCard.Builder()
-                    .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI)
-                    .setName(DataUsageSlice.PATH_DATA_USAGE)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-            add(new ContextualCard.Builder()
-                    .setSliceUri(BatterySlice.BATTERY_CARD_URI)
-                    .setName(BatterySlice.PATH_BATTERY_INFO)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-            add(new ContextualCard.Builder()
-                    .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI)
-                    .setName(DeviceInfoSlice.PATH_DEVICE_INFO)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-        }};
+        final List<ContextualCard> result = new ArrayList();
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI)
+                .setName(DataUsageSlice.PATH_DATA_USAGE)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(BatterySlice.BATTERY_CARD_URI)
+                .setName(BatterySlice.PATH_BATTERY_INFO)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI)
+                .setName(DeviceInfoSlice.PATH_DEVICE_INFO)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
         return result;
     }
 
     @VisibleForTesting
-    List<ContextualCard> filter(List<ContextualCard> candidates) {
-        return candidates.stream().filter(card -> isCardEligibleToDisplay(card)).collect(
-                Collectors.toList());
+    List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
+        return candidates.stream().filter(card -> isCardEligibleToDisplay(card))
+                .collect(Collectors.toList());
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/homepage/ContextualCardLookupTable.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
similarity index 84%
rename from src/com/android/settings/homepage/ContextualCardLookupTable.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
index 1acd812d57c..0268fb097c8 100644
--- a/src/com/android/settings/homepage/ContextualCardLookupTable.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import com.android.settings.homepage.ContextualCard.CardType;
-import com.android.settings.homepage.conditional.ConditionContextualCardController;
-import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
-import com.android.settings.homepage.slices.SliceContextualCardController;
-import com.android.settings.homepage.slices.SliceContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard.CardType;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
 
 import java.util.Set;
 import java.util.TreeSet;
diff --git a/src/com/android/settings/homepage/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
similarity index 91%
rename from src/com/android/settings/homepage/ContextualCardManager.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
index 6acf7b1ade3..51bef8726c9 100644
--- a/src/com/android/settings/homepage/ContextualCardManager.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import static com.android.settings.homepage.CardContentLoader.CARD_CONTENT_LOADER_ID;
+import static com.android.settings.homepage.contextualcards.ContextualCardLoader.CARD_CONTENT_LOADER_ID;
 
 import static java.util.stream.Collectors.groupingBy;
 
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 /**
  * This is a centralized manager of multiple {@link ContextualCardController}.
  *
- * {@link ContextualCardManager} first loads data from {@link CardContentLoader} and gets back a
+ * {@link ContextualCardManager} first loads data from {@link ContextualCardLoader} and gets back a
  * list of {@link ContextualCard}. All subclasses of {@link ContextualCardController} are loaded
  * here, which will then trigger the {@link ContextualCardController} to load its data and listen to
  * corresponding changes. When every single {@link ContextualCardController} updates its data, the
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
  * {@link ContextualCardsAdapter} and {@link BaseAdapter#notifyDataSetChanged()} will be called to
  * get the page refreshed.
  */
-public class ContextualCardManager implements CardContentLoader.CardContentLoaderListener,
+public class ContextualCardManager implements ContextualCardLoader.CardContentLoaderListener,
         ContextualCardUpdateListener {
 
     private static final String TAG = "ContextualCardManager";
@@ -80,7 +80,7 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
         }
     }
 
-    void loadContextualCards(PersonalSettingsFragment fragment) {
+    void loadContextualCards(ContextualCardsFragment fragment) {
         final CardContentLoaderCallbacks cardContentLoaderCallbacks =
                 new CardContentLoaderCallbacks(mContext);
         cardContentLoaderCallbacks.setListener(this);
@@ -157,13 +157,13 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
             LoaderManager.LoaderCallbacks<List<ContextualCard>> {
 
         private Context mContext;
-        private CardContentLoader.CardContentLoaderListener mListener;
+        private ContextualCardLoader.CardContentLoaderListener mListener;
 
         CardContentLoaderCallbacks(Context context) {
             mContext = context.getApplicationContext();
         }
 
-        protected void setListener(CardContentLoader.CardContentLoaderListener listener) {
+        protected void setListener(ContextualCardLoader.CardContentLoaderListener listener) {
             mListener = listener;
         }
 
@@ -171,7 +171,7 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
         @Override
         public Loader<List<ContextualCard>> onCreateLoader(int id, @Nullable Bundle bundle) {
             if (id == CARD_CONTENT_LOADER_ID) {
-                return new CardContentLoader(mContext);
+                return new ContextualCardLoader(mContext);
             } else {
                 throw new IllegalArgumentException("Unknown loader id: " + id);
             }
diff --git a/src/com/android/settings/homepage/ContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java
similarity index 96%
rename from src/com/android/settings/homepage/ContextualCardRenderer.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java
index 315c09d93ca..689b57232c2 100644
--- a/src/com/android/settings/homepage/ContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.view.View;
 
diff --git a/src/com/android/settings/homepage/ContextualCardUpdateListener.java b/src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java
similarity index 95%
rename from src/com/android/settings/homepage/ContextualCardUpdateListener.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java
index 60dd3a7147a..725f6dae4ed 100644
--- a/src/com/android/settings/homepage/ContextualCardUpdateListener.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/com/android/settings/homepage/ContextualCardsAdapter.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
similarity index 98%
rename from src/com/android/settings/homepage/ContextualCardsAdapter.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
index 4144d4da6d8..7938227afe3 100644
--- a/src/com/android/settings/homepage/ContextualCardsAdapter.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/src/com/android/settings/homepage/ContextualCardsDiffCallback.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java
similarity index 96%
rename from src/com/android/settings/homepage/ContextualCardsDiffCallback.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java
index 84c6884d458..d1623cd8ef4 100644
--- a/src/com/android/settings/homepage/ContextualCardsDiffCallback.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import androidx.recyclerview.widget.DiffUtil;
 
diff --git a/src/com/android/settings/homepage/PersonalSettingsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
similarity index 89%
rename from src/com/android/settings/homepage/PersonalSettingsFragment.java
rename to src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
index 93c723b9522..d82fdfeaa5e 100644
--- a/src/com/android/settings/homepage/PersonalSettingsFragment.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import static com.android.settings.homepage.ContextualCardsAdapter.SPAN_COUNT;
+import static com.android.settings.homepage.contextualcards.ContextualCardsAdapter.SPAN_COUNT;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -30,9 +30,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 
-public class PersonalSettingsFragment extends InstrumentedFragment {
+public class ContextualCardsFragment extends InstrumentedFragment {
 
-    private static final String TAG = "PersonalSettingsFragment";
+    private static final String TAG = "ContextualCardsFragment";
 
     private RecyclerView mCardsContainer;
     private GridLayoutManager mLayoutManager;
diff --git a/src/com/android/settings/homepage/ControllerRendererPool.java b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
similarity index 89%
rename from src/com/android/settings/homepage/ControllerRendererPool.java
rename to src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
index 73f73a5d39c..212b6beff25 100644
--- a/src/com/android/settings/homepage/ControllerRendererPool.java
+++ b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.util.Log;
@@ -22,10 +22,10 @@ import android.util.Log;
 import androidx.collection.ArraySet;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.android.settings.homepage.conditional.ConditionContextualCardController;
-import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
-import com.android.settings.homepage.slices.SliceContextualCardController;
-import com.android.settings.homepage.slices.SliceContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
 
 import java.util.Set;
 
diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
index 0d72cebd3b3..572c36dc15b 100644
--- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
+++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
@@ -20,11 +20,11 @@ import static android.provider.SettingsSlicesContract.KEY_WIFI;
 
 import android.annotation.Nullable;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
-import com.android.settings.homepage.deviceinfo.StorageSlice;
-import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
 import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
 import com.android.settings.wifi.WifiSlice;
diff --git a/src/com/android/settings/homepage/conditional/AbnormalRingerConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/AbnormalRingerConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java
index c6fa21d38c0..6a66d2f9556 100644
--- a/src/com/android/settings/homepage/conditional/AbnormalRingerConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionCard.java
index 2fbe80a2ded..d4fc2750124 100644
--- a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/AirplaneModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/AirplaneModeConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
index db3bc71375b..759956688e4 100644
--- a/src/com/android/settings/homepage/conditional/AirplaneModeConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/homepage/conditional/BackgroundDataConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/BackgroundDataConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionCard.java
index 13792a9634d..e3de2d63f25 100644
--- a/src/com/android/settings/homepage/conditional/BackgroundDataConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/BackgroundDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/BackgroundDataConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
index 0dc3cf124f9..fa40cf359ef 100644
--- a/src/com/android/settings/homepage/conditional/BackgroundDataConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/homepage/conditional/BatterySaverConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/BatterySaverConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionCard.java
index ea84cb2f521..4423592daf1 100644
--- a/src/com/android/settings/homepage/conditional/BatterySaverConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/BatterySaverConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/BatterySaverConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
index fdbe69866f4..8887c7db8f5 100644
--- a/src/com/android/settings/homepage/conditional/BatterySaverConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.os.PowerManager;
diff --git a/src/com/android/settings/homepage/conditional/CellularDataConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/CellularDataConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionCard.java
index f135c4f8664..e401de04be7 100644
--- a/src/com/android/settings/homepage/conditional/CellularDataConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/CellularDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/CellularDataConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
index c5c92c22e54..5709bf672cd 100644
--- a/src/com/android/settings/homepage/conditional/CellularDataConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/homepage/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
similarity index 92%
rename from src/com/android/settings/homepage/conditional/ConditionContextualCardController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
index 6a9c8dbe225..1f1f757e120 100644
--- a/src/com/android/settings/homepage/conditional/ConditionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.util.ArrayMap;
 
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardController;
-import com.android.settings.homepage.ContextualCardUpdateListener;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
diff --git a/src/com/android/settings/homepage/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
similarity index 94%
rename from src/com/android/settings/homepage/conditional/ConditionContextualCardRenderer.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
index 69988aeabdb..8a3635be443 100644
--- a/src/com/android/settings/homepage/conditional/ConditionContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -27,9 +27,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ControllerRendererPool;
-import com.android.settings.homepage.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ControllerRendererPool;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
diff --git a/src/com/android/settings/homepage/conditional/ConditionListener.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java
similarity index 91%
rename from src/com/android/settings/homepage/conditional/ConditionListener.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java
index 1e5ec1f4a55..5f743b3895b 100644
--- a/src/com/android/settings/homepage/conditional/ConditionListener.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 public interface ConditionListener {
     void onConditionsChanged();
diff --git a/src/com/android/settings/homepage/conditional/ConditionManager.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
similarity index 99%
rename from src/com/android/settings/homepage/conditional/ConditionManager.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
index 036695fb08d..d910b9075b4 100644
--- a/src/com/android/settings/homepage/conditional/ConditionManager.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/src/com/android/settings/homepage/conditional/ConditionalCard.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCard.java
similarity index 94%
rename from src/com/android/settings/homepage/conditional/ConditionalCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionalCard.java
index f4c4547fe6d..4d80a735238 100644
--- a/src/com/android/settings/homepage/conditional/ConditionalCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/src/com/android/settings/homepage/conditional/ConditionalCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java
similarity index 94%
rename from src/com/android/settings/homepage/conditional/ConditionalCardController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java
index 9993f343731..0447b11e7e1 100644
--- a/src/com/android/settings/homepage/conditional/ConditionalCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/homepage/conditional/ConditionalContextualCard.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java
similarity index 94%
rename from src/com/android/settings/homepage/conditional/ConditionalContextualCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java
index 828f90b76de..5537dd56420 100644
--- a/src/com/android/settings/homepage/conditional/ConditionalContextualCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.homepage.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCard;
 
 /**
  * Data class representing a conditional {@link ContextualCard}.
diff --git a/src/com/android/settings/homepage/conditional/DndConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/DndConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/DndConditionCard.java
index dbc0d8394e9..c4adaa48b9f 100644
--- a/src/com/android/settings/homepage/conditional/DndConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
similarity index 98%
rename from src/com/android/settings/homepage/conditional/DndConditionCardController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
index 1729815ffd3..2903428d056 100644
--- a/src/com/android/settings/homepage/conditional/DndConditionCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
diff --git a/src/com/android/settings/homepage/conditional/HotspotConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionCard.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/HotspotConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionCard.java
index fd996932717..35c9251e6f5 100644
--- a/src/com/android/settings/homepage/conditional/HotspotConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/HotspotConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
similarity index 98%
rename from src/com/android/settings/homepage/conditional/HotspotConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
index 5ff7f239e27..1a6aa0c0b01 100644
--- a/src/com/android/settings/homepage/conditional/HotspotConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/homepage/conditional/NightDisplayConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/NightDisplayConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionCard.java
index e0c6ee0a57d..eadb6b292b2 100644
--- a/src/com/android/settings/homepage/conditional/NightDisplayConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/NightDisplayConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
similarity index 97%
rename from src/com/android/settings/homepage/conditional/NightDisplayConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
index b4816f15a05..6b005650a44 100644
--- a/src/com/android/settings/homepage/conditional/NightDisplayConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/homepage/conditional/RingerMutedConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/RingerMutedConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionCard.java
index 47d64077991..d7009f672af 100644
--- a/src/com/android/settings/homepage/conditional/RingerMutedConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/RingerMutedConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/RingerMutedConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
index 4fce1ec9b03..cbab1bbf598 100644
--- a/src/com/android/settings/homepage/conditional/RingerMutedConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
 
diff --git a/src/com/android/settings/homepage/conditional/RingerVibrateConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/RingerVibrateConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCard.java
index 229cc83f5ec..38e3d88fad1 100644
--- a/src/com/android/settings/homepage/conditional/RingerVibrateConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/RingerVibrateConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
similarity index 94%
rename from src/com/android/settings/homepage/conditional/RingerVibrateConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
index 43de0803e7e..e230e8c2875 100644
--- a/src/com/android/settings/homepage/conditional/RingerVibrateConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.media.AudioManager;
diff --git a/src/com/android/settings/homepage/conditional/WorkModeConditionCard.java b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionCard.java
similarity index 96%
rename from src/com/android/settings/homepage/conditional/WorkModeConditionCard.java
rename to src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionCard.java
index c283bece726..86313ad621d 100644
--- a/src/com/android/settings/homepage/conditional/WorkModeConditionCard.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionCard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/settings/homepage/conditional/WorkModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
similarity index 98%
rename from src/com/android/settings/homepage/conditional/WorkModeConditionController.java
rename to src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
index 033a6a86070..9cdac03ff7d 100644
--- a/src/com/android/settings/homepage/conditional/WorkModeConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/settings/homepage/deviceinfo/BatterySlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java
similarity index 98%
rename from src/com/android/settings/homepage/deviceinfo/BatterySlice.java
rename to src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java
index 1090b40fe8b..873b942aaff 100644
--- a/src/com/android/settings/homepage/deviceinfo/BatterySlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
similarity index 98%
rename from src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java
rename to src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
index aebeaaeceb1..6296b1ee8c5 100644
--- a/src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/homepage/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
similarity index 98%
rename from src/com/android/settings/homepage/deviceinfo/DeviceInfoSlice.java
rename to src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
index ded48984fba..d6fdfd57740 100644
--- a/src/com/android/settings/homepage/deviceinfo/DeviceInfoSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/homepage/deviceinfo/EmergencyInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
similarity index 97%
rename from src/com/android/settings/homepage/deviceinfo/EmergencyInfoSlice.java
rename to src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
index 62678b37516..aff34f429d8 100644
--- a/src/com/android/settings/homepage/deviceinfo/EmergencyInfoSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/homepage/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
similarity index 98%
rename from src/com/android/settings/homepage/deviceinfo/StorageSlice.java
rename to src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
index 0f95c57fa03..c61a8a06557 100644
--- a/src/com/android/settings/homepage/deviceinfo/StorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/homepage/slices/SliceContextualCardController.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
similarity index 79%
rename from src/com/android/settings/homepage/slices/SliceContextualCardController.java
rename to src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
index e6fc283d206..5711dc5d03f 100644
--- a/src/com/android/settings/homepage/slices/SliceContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.slices;
+package com.android.settings.homepage.contextualcards.slices;
 
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardController;
-import com.android.settings.homepage.ContextualCardUpdateListener;
-
-import java.util.List;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
 
 /**
  * Card controller for {@link ContextualCard} built as slices.
diff --git a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
similarity index 95%
rename from src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
rename to src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index 29e9aedf26c..c2bf5360132 100644
--- a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.slices;
+package com.android.settings.homepage.contextualcards.slices;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -35,8 +35,8 @@ import androidx.slice.widget.SliceLiveData;
 import androidx.slice.widget.SliceView;
 
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
 
 import java.util.Map;
 
diff --git a/src/com/android/settings/slices/CustomSliceManager.java b/src/com/android/settings/slices/CustomSliceManager.java
index a207fccfcb6..4658d2a0b98 100644
--- a/src/com/android/settings/slices/CustomSliceManager.java
+++ b/src/com/android/settings/slices/CustomSliceManager.java
@@ -20,10 +20,10 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.ArrayMap;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
-import com.android.settings.homepage.deviceinfo.StorageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.wifi.WifiSlice;
 
 import java.util.Map;
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 5e3e92fc88d..39116037949 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -42,7 +42,7 @@ import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.flashlight.FlashlightSliceBuilder;
-import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice;
 import com.android.settings.location.LocationSliceBuilder;
 import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
 import com.android.settings.notification.ZenModeSliceBuilder;
diff --git a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
index f89d037806f..0ffabb47085 100644
--- a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
@@ -12,10 +12,9 @@
  * 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.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
index 6a17a257100..4ef982fe17e 100644
--- a/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
@@ -12,10 +12,9 @@
  * 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.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/ConditionalContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/homepage/ConditionalContextualCardTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
index ced8b0691a8..2cff9f26bce 100644
--- a/tests/robotests/src/com/android/settings/homepage/ConditionalContextualCardTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.homepage.conditional.ConditionalContextualCard;
+import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/homepage/CardContentLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
similarity index 77%
rename from tests/robotests/src/com/android/settings/homepage/CardContentLoaderTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index 853cf20ec8a..6aeb5c00f86 100644
--- a/tests/robotests/src/com/android/settings/homepage/CardContentLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.net.Uri;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
-import com.android.settings.homepage.deviceinfo.StorageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
 import com.android.settings.slices.SettingsSliceProvider;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -39,16 +38,16 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-public class CardContentLoaderTest {
+public class ContextualCardLoaderTest {
 
     private Context mContext;
-    private CardContentLoader mCardContentLoader;
+    private ContextualCardLoader mContextualCardLoader;
     private SettingsSliceProvider mProvider;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mCardContentLoader = new CardContentLoader(mContext);
+        mContextualCardLoader = new ContextualCardLoader(mContext);
         mProvider = new SettingsSliceProvider();
         ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
                 mProvider);
@@ -56,7 +55,7 @@ public class CardContentLoaderTest {
 
     @Test
     public void createStaticCards_shouldReturnFourCards() {
-        final List<ContextualCard> defaultData = mCardContentLoader.createStaticCards();
+        final List<ContextualCard> defaultData = mContextualCardLoader.createStaticCards();
 
         assertThat(defaultData).hasSize(3);
     }
@@ -68,7 +67,7 @@ public class CardContentLoaderTest {
         final Uri batteryInfo = BatterySlice.BATTERY_CARD_URI;
         final List<Uri> expectedUris = Arrays.asList(dataUsage, deviceInfo, batteryInfo);
 
-        final List<Uri> actualCardUris = mCardContentLoader.createStaticCards().stream().map(
+        final List<Uri> actualCardUris = mContextualCardLoader.createStaticCards().stream().map(
                 ContextualCard::getSliceUri).collect(Collectors.toList());
 
         assertThat(actualCardUris).containsExactlyElementsIn(expectedUris);
@@ -83,7 +82,7 @@ public class CardContentLoaderTest {
                 .setSummaryText("custom_summary")
                 .build();
 
-        assertThat(mCardContentLoader.isCardEligibleToDisplay(customCard)).isTrue();
+        assertThat(mContextualCardLoader.isCardEligibleToDisplay(customCard)).isTrue();
     }
 
     @Test
@@ -91,7 +90,7 @@ public class CardContentLoaderTest {
         final String sliceUri = "contet://com.android.settings.slices/action/flashlight";
 
         assertThat(
-                mCardContentLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
+                mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
     }
 
     @Test
@@ -99,7 +98,7 @@ public class CardContentLoaderTest {
         final String sliceUri = "content://com.android.settings.test.slices/action/flashlight";
 
         assertThat(
-                mCardContentLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
+                mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
     }
 
     private ContextualCard getContextualCard(String sliceUri) {
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
index 9da13362db2..91071db5d8e 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
index e3db59b0853..05060aa59ba 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
index bf99a776c12..d28ab0f9598 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
index a59a3bc2462..2befb21607d 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -26,7 +26,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCardUpdateListener;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
index dc56a7f16c0..ccfbbfb2fe8 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ControllerRendererPool;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ControllerRendererPool;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
index 3fbac17a897..82c638126aa 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
index 9fde60740f7..9eb6145ce73 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 
 import static org.mockito.ArgumentMatchers.any;
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardTest.java
index b22c89ac051..506d3bfb309 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/NightDisplayConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/homepage/conditional/NightDisplayConditionControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
index 130df90c696..0ef23be13b8 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/NightDisplayConditionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static org.mockito.Mockito.verify;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCardTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionCardTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCardTest.java
index 1f976ddd118..0ade54d77ad 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionCardTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCardTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionControllerTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
index c993e68923d..847d28cf889 100644
--- a/tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/BatterySliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/homepage/deviceinfo/BatterySliceTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
index 8baaab4af49..72c29facb90 100644
--- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/BatterySliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
index 9993369953e..fc74df92ce7 100644
--- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
index 58a72202bff..2083456531b 100644
--- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
index effc8da9a51..17d7bd20541 100644
--- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
index b8f8415a0dc..025f2623695 100644
--- a/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.slices;
+package com.android.settings.homepage.contextualcards.slices;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.slice.Slice;
 
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.PersonalSettingsFragment;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -56,7 +56,7 @@ public class SliceContextualCardRendererTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mLifecycleOwner = new PersonalSettingsFragment();
+        mLifecycleOwner = new ContextualCardsFragment();
         mRenderer = new SliceContextualCardRenderer(mContext, mLifecycleOwner);
     }
 
diff --git a/tests/unit/src/com/android/settings/homepage/CardContentLoaderTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
similarity index 86%
rename from tests/unit/src/com/android/settings/homepage/CardContentLoaderTest.java
rename to tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index 38a1f5a65b0..5bdeb8d2a11 100644
--- a/tests/unit/src/com/android/settings/homepage/CardContentLoaderTest.java
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,15 +31,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
-public class CardContentLoaderTest {
+public class ContextualCardLoaderTest {
 
     private Context mContext;
-    private CardContentLoader mCardContentLoader;
+    private ContextualCardLoader mContextualCardLoader;
 
     @Before
     public void setUp() {
         mContext = InstrumentationRegistry.getTargetContext();
-        mCardContentLoader = new CardContentLoader(mContext);
+        mContextualCardLoader = new ContextualCardLoader(mContext);
     }
 
     @Test
@@ -53,7 +53,7 @@ public class CardContentLoaderTest {
         cards.add(getContextualCard(sliceUri2));
         cards.add(getContextualCard(sliceUri3));
 
-        final List<ContextualCard> result = mCardContentLoader.filter(cards);
+        final List<ContextualCard> result = mContextualCardLoader.filterEligibleCards(cards);
 
         assertThat(result).hasSize(1);
     }