Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new application category for accessibility" into sc-dev

Browse Source
This commit is contained in:
Ryan Lin
2021-03-04 02:18:22 +00:00
committed by Android (Google) Code Review
parent 0e3c11d860 0eaebf0c84
commit 880fdaf4cf
5 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -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

12
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -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;
}

2
core/res/res/values/attrs_manifest.xml
View File

@@ -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 -->

2
core/res/res/values/strings.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />