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

am: b7e08a4fc6

Change-Id: Iaf50fb0512aff53dd6d4cdebc9e6600ecadfd1e0

res/drawable/ic_forum_24dp.xml

@@ -1,30 +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.
--->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M21,6h-2v9H6v2c0,0.55 0.45,1 1,1h11l4,4V7c0,-0.55 -0.45,-1
-         -1,-1zm-4,6V3c0,-0.55 -0.45,-1 -1,-1H3c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0
-         1,-0.45 1,-1z"/>
-</vector>

res/values/strings.xml

@@ -7518,9 +7518,6 @@
     <!-- Button label for contacting customer support by chat [CHAR LIMIT=20]-->
     <string name="support_escalation_by_chat">Support chat</string>
 
-    <!-- Button label for visiting help forum [CHAR LIMIT=60]-->
-    <string name="support_forum_title">Help forum</string>
-
     <!-- Button label for visiting the tips & tricks site [CHAR LIMIT=60]-->
     <string name="support_tips_and_tricks_title">Tips &amp; tricks</string>
 

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.
      */