commit a6906adf59808da70f39a9b5db0e6a986fa371d1
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 22 04:22:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 04:22:19 2017 +0000
tree a4a872330c4808498835a42b6c1628c57b7f6421
parent bc5af4b47b2af8819d235cbf12ad29f16f8a3623
parent d2b69100f401de42a6d43ebb3093c7f5f3c9b79a

Merge "Explicitly call out email in "social" category."

core/java/android/content/pm/ApplicationInfo.java

diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 0b3742f..ffc7719 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -920,7 +920,7 @@
 
     /**
      * Category for apps which are primarily social apps, such as messaging,
-     * communication, or social network apps.
+     * communication, email, or social network apps.
      *
      * @see #category
      */

core/res/res/values/attrs_manifest.xml

diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index cf6bd9e..b9409f2 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1422,7 +1422,7 @@
             <enum name="video" value="2" />
             <!-- Apps which primarily work with images or photos, such as camera or gallery apps. -->
             <enum name="image" value="3" />
-            <!-- Apps which are primarily social apps, such as messaging, communication, or social network apps. -->
+            <!-- Apps which are primarily social apps, such as messaging, communication, email, or social network apps. -->
             <enum name="social" value="4" />
             <!-- Apps which are primarily news apps, such as newspapers, magazines, or sports apps. -->
             <enum name="news" value="5" />

core/res/res/values/strings.xml

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 8676c33..d4db258 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4537,7 +4537,7 @@
     <string name="app_category_video">Movies &amp; Video</string>
     <!-- Category title for apps which primarily work with images or photos, such as camera or gallery apps. [CHAR LIMIT=32] -->
     <string name="app_category_image">Photos &amp; Images</string>
-    <!-- Category title for apps which are primarily social apps, such as messaging, communication, or social network apps. [CHAR LIMIT=32] -->
+    <!-- Category title for apps which are primarily social apps, such as messaging, communication, email, or social network apps. [CHAR LIMIT=32] -->
     <string name="app_category_social">Social &amp; Communication</string>
     <!-- Category title for apps which are primarily news apps, such as newspapers, magazines, or sports apps. [CHAR LIMIT=32] -->
     <string name="app_category_news">News &amp; Magazines</string>