AE: Welcome Discord, rip google plus :(o8.1

Change-Id: Ia1bed14cebabca83662b1c563c74487e832047d4

25 files changed, 6 insertions, 68 deletions

diff --git a/res/drawable/ic_launcher_shortcut_g_plus.xml b/res/drawable/ic_launcher_shortcut_g_plus.xml
deleted file mode 100644
index 9cd073478..000000000
--- a/res/drawable/ic_launcher_shortcut_g_plus.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path android:fillColor="@color/launcher_shortcut"
-        android:pathData="M23,11H21V9H19V11H17V13H19V15H21V13H23M8,11V13.4H12C11.8,14.4 10.8,16.4 8,16.4C5.6,16.4 3.7,14.4 3.7,12C3.7,9.6 5.6,7.6 8,7.6C9.4,7.6 10.3,8.2 10.8,8.7L12.7,6.9C11.5,5.7 9.9,5 8,5C4.1,5 1,8.1 1,12C1,15.9 4.1,19 8,19C12,19 14.7,16.2 14.7,12.2C14.7,11.7 14.7,11.4 14.6,11H8Z" />
-</vector>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 50b2ac5c7..bcb9d0b25 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -520,8 +520,6 @@
   <string name="info_category">معلومات</string>
   <string name="aicp_website_title">الموقع الإلكتروني</string>
   <string name="aicp_website_summary">قم بزيارة موقع AICP</string>
-  <string name="g_plus_title">مجتمع G+</string>
-  <string name="g_plus_summary">انضم إلى مجتمعنا +Google</string>
   <string name="aicp_gerrit_title">جيريت</string>
   <string name="aicp_gerrit_summary">قم بزيارة موقعنا لتعرف ما نحن نعمل عليه</string>
   <string name="aicp_changelog_title">سجل التغييرات</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index db60a92c4..359f5e298 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Informace</string>
     <string name="aicp_website_title">Webová stránka</string>
     <string name="aicp_website_summary">Navštívit webovou stránku AICP</string>
-    <string name="g_plus_title">Komunita G+</string>
-    <string name="g_plus_summary">Navštivte naši komunitu G+</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Navštivte náš Gerrit, abyste věděli, na čem pracujeme</string>
     <string name="aicp_changelog_title">Seznam změn</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6a65aba7f..3eea5190f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -553,8 +553,6 @@ Ordner AICP_backup gesichert.\nAlte Sicherungen müssen manuell gelöscht werden
     <string name="info_category">Informationen</string>
     <string name="aicp_website_title">Internetseite</string>
     <string name="aicp_website_summary">Besuche die Website vom AICP</string>
-    <string name="g_plus_title">G+ Community</string>
-    <string name="g_plus_summary">Besuche unsere Google+ Community</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Besuche unser Review-System online, um zu erfahren, an was wir gerade arbeiten</string>
     <string name="aicp_changelog_title">Änderungsprotokoll</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1c24e5e7d..aff7d7242 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -372,8 +372,6 @@
   <string name="info_category">Πληροφορίες</string>
   <string name="aicp_website_title">Ιστοσελίδα</string>
   <string name="aicp_website_summary">Επισκεφθείτε την ιστοσελίδα της AICP</string>
-  <string name="g_plus_title">Κοινότητα G+</string>
-  <string name="g_plus_summary">Επισκεφθείτε την κοινότητα μας στο Google +</string>
   <string name="aicp_gerrit_title">Gerrit</string>
   <string name="aicp_gerrit_summary">Για να δείτε τι ετοιμάζουμε, επισκεφτείτε μας στο Gerrit</string>
   <string name="aicp_changelog_title">Πρόσφατες Αλλαγές</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 396dcad6d..73b67e6eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Información</string>
     <string name="aicp_website_title">Sitio web</string>
     <string name="aicp_website_summary">Visite la página web de AICP</string>
-    <string name="g_plus_title">Conunidad G+</string>
-    <string name="g_plus_summary">Visitar nuestra comunidad en Google+</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Visitar nuestro Gerrit para saber en qué estamos trabajando</string>
     <string name="aicp_changelog_title">Lista de cambios</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d1669c95e..144ac6e87 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -300,8 +300,6 @@
   <string name="info_category">Information</string>
   <string name="aicp_website_title">Site web</string>
   <string name="aicp_website_summary">Visiter le site WEB d\'AICP</string>
-  <string name="g_plus_title">Communauté G+</string>
-  <string name="g_plus_summary">Visitez notre communauté Google +</string>
   <string name="aicp_gerrit_title">Gerrit</string>
   <string name="aicp_changelog_title">Journal des modifications</string>
   <string name="aicp_changelog_summary">Voir les récentes modifications de la ROM</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dfa3ccaa3..e0e4ee67d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Infó</string>
     <string name="aicp_website_title">Weboldal</string>
     <string name="aicp_website_summary">Látogasson el a AICP honlapjára</string>
-    <string name="g_plus_title">G+ közösség</string>
-    <string name="g_plus_summary">Látogasson el a Google + közösségünkhöz</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Látogassa meg a Gerrit-et, hogy tudja min dologzunk jelenleg</string>
     <string name="aicp_changelog_title">Változások</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5bb96c9be..c49e5d715 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Info</string>
     <string name="aicp_website_title">Laman</string>
     <string name="aicp_website_summary">Kunjungi laman AICP</string>
-    <string name="g_plus_title">Komunitas G+</string>
-    <string name="g_plus_summary">Kunjungi komunitas Google+ kami</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Kunjungi gerrit kami untuk mengetahui apa yang sedang kami kerjakan</string>
     <string name="aicp_changelog_title">Perubahan</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a204b2077..1f5ef937f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Informazioni</string>
     <string name="aicp_website_title">Sito web</string>
     <string name="aicp_website_summary">Visita il sito AICP</string>
-    <string name="g_plus_title">Comunità G+</string>
-    <string name="g_plus_summary">Visita la nostra community di Google+</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Visita il nostro gerrit per sapere a cosa stiamo lavorando</string>
     <string name="aicp_changelog_title">Registro Modifiche</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e92be653f..602e43860 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">情報</string>
     <string name="aicp_website_title">ウェブサイト</string>
     <string name="aicp_website_summary">AICP のウェブサイトにアクセスします</string>
-    <string name="g_plus_title">Google+ コミュニティ</string>
-    <string name="g_plus_summary">Google+ コミュニティにアクセスします</string>
     <string name="aicp_gerrit_title">Gerrit Code Review</string>
     <string name="aicp_gerrit_summary">Gerrit で AICP の開発の最前線をチェックします</string>
     <string name="aicp_changelog_title">更新履歴</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fb54f43e6..533321d0c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -452,7 +452,6 @@
   <!-- About -->
   <string name="about_title">소개</string>
   <string name="about_summary">이 ROM에 대한 정보보기</string>
-  <string name="g_plus_title">G+ 커뮤니티</string>
   <string name="aicp_gerrit_title">Gerrit</string>
   <string name="aicp_gerrit_summary">우리가 일하고있는 것을 알기 위해 우리의 gerrit를 방문하십시오.</string>
   <string name="aicp_changelog_title">변경 사항</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 11702980b..8aa0f1936 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Info</string>
     <string name="aicp_website_title">Website</string>
     <string name="aicp_website_summary">Bezoek de AICP website</string>
-    <string name="g_plus_title">G+ community</string>
-    <string name="g_plus_summary">Bezoek onze Google+ Community</string>
     <string name="aicp_gerrit_title">Bezoek Gerrit</string>
     <string name="aicp_gerrit_summary">Bzeoek onze Gerrit om te zien waar we aan werken</string>
     <string name="aicp_changelog_title">Overzicht van wijzigingen</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6538a6d69..90705f8d0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Informacje</string>
     <string name="aicp_website_title">Strona WWW</string>
     <string name="aicp_website_summary">Odwiedź witrynę AICP</string>
-    <string name="g_plus_title">Społeczność G+</string>
-    <string name="g_plus_summary">Przejdź na stronę społeczności Google +</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Odwiedź nasz gerrit, aby wiedzieć nad czym pracujemy</string>
     <string name="aicp_changelog_title">Dziennik zmian</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c5eda8982..a74ec954f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Informações</string>
     <string name="aicp_website_title">Site</string>
     <string name="aicp_website_summary">Visite o site do AICP</string>
-    <string name="g_plus_title">G+ community</string>
-    <string name="g_plus_summary">Participe da nossa comunidade do Google +</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Visite o nosso Gerrit para saber no que estamos trabalhando</string>
     <string name="aicp_changelog_title">Mudanças</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 67cac9ce5..0a23df2e5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Informação</string>
     <string name="aicp_website_title">Website</string>
     <string name="aicp_website_summary">Visite o site da AICP</string>
-    <string name="g_plus_title">G + Comunidade</string>
-    <string name="g_plus_summary">Visite nossa comunidade do Google +</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Visite nosso gerrit para saber o que estamos a trabalhar na</string>
     <string name="aicp_changelog_title">Registo de alterações</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a4b14c404..3ed4312e6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Информация</string>
     <string name="aicp_website_title">Веб-сайт</string>
     <string name="aicp_website_summary">Посетить веб-сайт AICP</string>
-    <string name="g_plus_title">G+ сообщество</string>
-    <string name="g_plus_summary">Посетить наше сообщество Google+</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Посетите наш Gerrit, чтобы узнать, над чем мы работаем</string>
     <string name="aicp_changelog_title">Список изменений</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a9c336be3..e3b5d39b7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">Informácie</string>
     <string name="aicp_website_title">Webstránka</string>
     <string name="aicp_website_summary">Navštíviť webovú stránku AICP</string>
-    <string name="g_plus_title">Komunita G+</string>
-    <string name="g_plus_summary">Navštívte našu G+ komunitu</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Navštívte náš Gerrit, aby ste vedeli, na čom pracujeme</string>
     <string name="aicp_changelog_title">Zoznam zmien</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b70e3a64b..a5d545f76 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">Bilgiler</string>
     <string name="aicp_website_title">İnternet sitesi</string>
     <string name="aicp_website_summary">AICP İnternet sitesini ziyaret et</string>
-    <string name="g_plus_title">G+ toğluluğu</string>
-    <string name="g_plus_summary">Google+ topluluğumuzu ziyaret et</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Neler üzerinde çalıştığımızı görmek için gerrit sayfamızı ziyaret et</string>
     <string name="aicp_changelog_title">Değişiklikler</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d3c9da826..d6a9b8e7a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -212,7 +212,6 @@
   <!-- AE settings -->
   <!-- About -->
   <string name="about_title">Thông tin</string>
-  <string name="g_plus_title">Cộng đồng G+</string>
   <string name="aicp_gerrit_title">Gerrit</string>
   <string name="aicp_changelog_title">Nhật ký thay đổi</string>
   <string name="aicp_downloads_title">Tải xuống</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 39a5b0c65..12241d037 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -553,8 +553,6 @@
     <string name="info_category">信息</string>
     <string name="aicp_website_title">网站</string>
     <string name="aicp_website_summary">访问 GIMP 网站</string>
-    <string name="g_plus_title">G+ 社区</string>
-    <string name="g_plus_summary">访问我们的 G+ 社区</string>
     <string name="aicp_gerrit_title">Gerrit 代码审查</string>
     <string name="aicp_gerrit_summary">访问我们的 Gerrit 来知道我们在为什么而工作</string>
     <string name="aicp_changelog_title">更新日志</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c283e40f3..16e74c645 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -552,8 +552,6 @@
     <string name="info_category">資訊</string>
     <string name="aicp_website_title">網站</string>
     <string name="aicp_website_summary">瀏覽 AICP 網站</string>
-    <string name="g_plus_title">G + 社群</string>
-    <string name="g_plus_summary">瀏覽我們的 Google+ 社群</string>
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">瀏覽我們的 gerrit 知道我們在做什麼</string>
     <string name="aicp_changelog_title">更新日誌</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b7d550d6..fd76b6c2e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -678,9 +678,9 @@
     <string name="aicp_walls_summary">See our AICP wallpapers</string>
     <string name="aicp_walls_link" translatable="false">"https://imgur.com/a/5xcwml9"</string>
 
-    <string name="g_plus_title">G+ community</string>
-    <string name="g_plus_summary">Visit our Google+ Community</string>
-    <string name="g_plus_link" translatable="false">"https://plus.google.com/communities/101008638920580274588"</string>
+    <string name="discord_title">Discord server</string>
+    <string name="discord_summary">Visit our Discord Server</string>
+    <string name="discord_link" translatable="false">"https://discord.gg/nMQUVRD"</string>
 
     <string name="aicp_gerrit_title">Gerrit</string>
     <string name="aicp_gerrit_summary">Visit our gerrit to know what we are working on</string>
diff --git a/res/xml/about.xml b/res/xml/about.xml
index 2f82c1969..c7fea03ee 100644
--- a/res/xml/about.xml
+++ b/res/xml/about.xml
@@ -62,10 +62,10 @@
         </Preference>
 
         <Preference
-            android:title="@string/g_plus_title"
-            android:summary="@string/g_plus_summary">
+            android:title="@string/discord_title"
+            android:summary="@string/discord_summary">
             <intent android:action="android.intent.action.VIEW"
-                android:data="@string/g_plus_link" />
+                android:data="@string/discord_link" />
         </Preference>
 
         <Preference
diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index dcaf14a44..a30908089 100644
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -24,17 +24,4 @@
             android:action="android.intent.action.VIEW"
             android:data="http://gerrit.aicp-rom.com"/>
     </shortcut>
-
-    <shortcut
-        android:shortcutId="g_plus"
-        android:enabled="true"
-        android:icon="@drawable/ic_launcher_shortcut_g_plus"
-        android:shortcutDisabledMessage="@string/launcher_shortcut_disabled_message"
-        android:shortcutLongLabel="@string/g_plus_title"
-        android:shortcutShortLabel="@string/g_plus_title">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://plus.google.com/communities/101008638920580274588"/>
-    </shortcut>
-
 </shortcuts>