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

Commit 3e0e069d authored by Ryan Lin's avatar Ryan Lin Committed by Automerger Merge Worker
Browse files

Merge "Add new application category for accessibility" into sc-dev am: 880fdaf4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13638906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c33c8210c46255fd0bb905f7e44074016352064
parents e653068a 880fdaf4

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11768,6 +11768,7 @@ package android.content.pm { 
    method public boolean isResourceOverlay();

    method public boolean isVirtualPreload();

    method public CharSequence loadDescription(android.content.pm.PackageManager);

    field public static final int CATEGORY_ACCESSIBILITY = 8; // 0x8

    field public static final int CATEGORY_AUDIO = 1; // 0x1

    field public static final int CATEGORY_GAME = 0; // 0x0

    field public static final int CATEGORY_IMAGE = 3; // 0x3

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

+11 −1
Original line number Diff line number Diff line
@@ -1205,7 +1205,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
            CATEGORY_SOCIAL,

            CATEGORY_NEWS,

            CATEGORY_MAPS,

            CATEGORY_PRODUCTIVITY

            CATEGORY_PRODUCTIVITY,

            CATEGORY_ACCESSIBILITY

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Category {
@@ -1280,6 +1281,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public static final int CATEGORY_PRODUCTIVITY = 7;



    /**

     * Category for apps which are primarily accessibility apps, such as screen-readers.

     *

     * @see #category

     */

    public static final int CATEGORY_ACCESSIBILITY = 8;



    /**

     * Return a concise, localized title for the given

     * {@link ApplicationInfo#category} value, or {@code null} for unknown
@@ -1305,6 +1313,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
                return context.getText(com.android.internal.R.string.app_category_maps);

            case ApplicationInfo.CATEGORY_PRODUCTIVITY:

                return context.getText(com.android.internal.R.string.app_category_productivity);

            case ApplicationInfo.CATEGORY_ACCESSIBILITY:

                return context.getText(com.android.internal.R.string.app_category_accessibility);

            default:

                return null;

        }

core/res/res/values/attrs_manifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -1773,6 +1773,8 @@ 
            <enum name="maps" value="6" />

            <!-- Apps which are primarily productivity apps, such as cloud storage or workplace apps. -->

            <enum name="productivity" value="7" />

            <!-- Apps which are primarily accessibility apps, such as screen-readers. -->

            <enum name="accessibility" value="8" />

        </attr>



        <!-- Declares the kind of classloader this application's classes must be loaded with -->

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5193,6 +5193,8 @@ 
    <string name="app_category_maps">Maps &amp; Navigation</string>

    <!-- Category title for apps which are primarily productivity apps, such as cloud storage or workplace apps. [CHAR LIMIT=32] -->

    <string name="app_category_productivity">Productivity</string>

    <!-- Category title for apps which are primarily accessibility apps, such as screen-readers. [CHAR LIMIT=32] -->

    <string name="app_category_accessibility">Accessibility</string>



    <!-- Channel name for DeviceStorageMonitor notifications -->

    <string name="device_storage_monitor_notification_channel">Device storage</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3300,6 +3300,7 @@ 
  <java-symbol type="string" name="app_category_news" />

  <java-symbol type="string" name="app_category_maps" />

  <java-symbol type="string" name="app_category_productivity" />

  <java-symbol type="string" name="app_category_accessibility" />



  <java-symbol type="raw" name="fallback_categories" />