Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6906adf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bc5af4b4 d2b69100

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

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 


    /**

     * 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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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>