diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
index 3eea6a51b78..5de9d551194 100644
--- a/res/layout/suggestion_condition_footer.xml
+++ b/res/layout/suggestion_condition_footer.xml
@@ -20,15 +20,16 @@
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
     android:layout_height="44dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="10dp"
+    android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
+    android:gravity="end"
     android:orientation="horizontal"
-    android:gravity="end">
+    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"/>
+        android:src="@drawable/ic_expand_less" />
 
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f68323a6763..22f7129fffc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6483,6 +6483,9 @@
         <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/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index d4397dc1c13..b28ff24bec5 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -48,7 +48,6 @@ import com.android.settings.dashboard.conditional.ConditionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -78,7 +77,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     private final SuggestionControllerMixin mSuggestionControllerMixin;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final DashboardFeatureProvider mDashboardFeatureProvider;
-    private final SuggestionFeatureProvider mSuggestionFeatureProvider;
     private final ArrayList<String> mSuggestionsShownLogged;
     private boolean mFirstFrameDrawn;
     private RecyclerView mRecyclerView;
@@ -114,7 +112,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         mSuggestionControllerMixin = suggestionControllerMixin;
         mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
-        mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
         mCache = new IconCache(context);
         mSuggestionParser = suggestionParser;
         mCallback = callback;
@@ -341,11 +338,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
             SuggestionConditionHeaderData data) {
         final int curMode = mDashboardData.getSuggestionConditionMode();
-        final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0
+        final int nextMode = data.hiddenSuggestionCount > 0
+                && data.conditionCount > 0
                 && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
                 ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
                 : DashboardData.HEADER_MODE_FULLY_EXPANDED;
-        final boolean moreSuggestions = data.hiddenSuggestionCount > 0;
+
         final boolean hasConditions = data.conditionCount > 0;
         if (data.conditionCount > 0) {
             holder.icon.setImageIcon(data.conditionIcons.get(0));