From 156453c0ada89581558f84010577c996bfda9882 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 14 Jun 2016 13:01:45 -0700
Subject: [PATCH] Remove forum link from support tab.

Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
---
 res/drawable/ic_forum_24dp.xml                | 30 -------------------
 res/values/strings.xml                        |  3 --
 .../dashboard/SupportItemAdapter.java         |  5 ----
 .../overlay/SupportFeatureProvider.java       |  5 ----
 4 files changed, 43 deletions(-)
 delete mode 100644 res/drawable/ic_forum_24dp.xml

diff --git a/res/drawable/ic_forum_24dp.xml b/res/drawable/ic_forum_24dp.xml
deleted file mode 100644
index 562c146452e..00000000000
--- a/res/drawable/ic_forum_24dp.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 565d1887749..64833169ff3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7524,9 +7524,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>
 
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 9dddc6a7a0d..0ed85246d71 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/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)
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index e95a92862b2..245aba3d55d 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/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.
      */