Merge \\"Remove forum link from support tab.\\" into nyc-mr1-dev am: 1c6674dbb2

am: b7e08a4fc6

Change-Id: Iaf50fb0512aff53dd6d4cdebc9e6600ecadfd1e0

src/com/android/settings/dashboard/SupportItemAdapter.java

@@ -181,11 +181,6 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
     }
 
     private void addMoreHelpItems() {
-        mSupportData.add(new SupportData.Builder(TYPE_SUPPORT_TILE)
-                .setIcon(R.drawable.ic_forum_24dp)
-                .setText1(R.string.support_forum_title)
-                .setIntent(mSupportFeatureProvider.getForumIntent())
-                .build());
         mSupportData.add(new SupportData.Builder(TYPE_SUPPORT_TILE)
                 .setIcon(R.drawable.ic_lightbulb_outline_24)
                 .setText1(R.string.support_tips_and_tricks_title)

src/com/android/settings/overlay/SupportFeatureProvider.java

@@ -38,11 +38,6 @@ public interface SupportFeatureProvider {
         int CHAT = 3;
     }
 
-    /**
-     * Returns a intent that will open help forum.
-     */
-    Intent getForumIntent();
-
     /**
      * Returns a intent that will open help & feedback.
      */