PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating the content description of disabled icons

Browse Source 
Bug: 27644457
Change-Id: I03aec29e0ea6017b51dcd7567967a067e478cefd
This commit is contained in:
Sunny Goyal
2016-07-13 10:46:07 -07:00
parent ba162aa7d2
commit f420438a0b
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values/strings.xml
+2
View File
@@ -112,6 +112,8 @@
<string name="folder_hint_text">Unnamed Folder</string>
<!-- Accessibility -->
<!-- The format string for when an app is temporarily disabled. -->
<string name="disabled_app_label">Disabled <xliff:g id="app_name" example="Messenger">%1$s</xliff:g></string>
<skip />
<!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
src/com/android/launcher3/BubbleTextView.java
+18 -26
View File
@@ -153,34 +153,16 @@ public class BubbleTextView extends TextView
public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache,
boolean promiseStateChanged) {
Bitmap b = info.getIcon(iconCache);
FastBitmapDrawable iconDrawable = mLauncher.createIconDrawable(b);
if (info.isDisabled()) {
iconDrawable.setState(FastBitmapDrawable.State.DISABLED);
}
setIcon(iconDrawable);
if (info.contentDescription != null) {
setContentDescription(info.contentDescription);
}
setText(info.title);
applyIconAndLabel(info.getIcon(iconCache), info);
setTag(info);
if (promiseStateChanged || info.isPromise()) {
applyState(promiseStateChanged);
}
}
public void applyFromApplicationInfo(AppInfo info) {
FastBitmapDrawable iconDrawable = mLauncher.createIconDrawable(info.iconBitmap);
if (info.isDisabled()) {
iconDrawable.setState(FastBitmapDrawable.State.DISABLED);
}
setIcon(iconDrawable);
setText(info.title);
if (info.contentDescription != null) {
setContentDescription(info.contentDescription);
}
applyIconAndLabel(info.iconBitmap, info);
// We don't need to check the info since it's not a ShortcutInfo
super.setTag(info);
@@ -189,11 +171,7 @@ public class BubbleTextView extends TextView
}
public void applyFromPackageItemInfo(PackageItemInfo info) {
setIcon(mLauncher.createIconDrawable(info.iconBitmap));
setText(info.title);
if (info.contentDescription != null) {
setContentDescription(info.contentDescription);
}
applyIconAndLabel(info.iconBitmap, info);
// We don't need to check the info since it's not a ShortcutInfo
super.setTag(info);
@@ -201,6 +179,20 @@ public class BubbleTextView extends TextView
verifyHighRes();
}
private void applyIconAndLabel(Bitmap icon, ItemInfo info) {
FastBitmapDrawable iconDrawable = mLauncher.createIconDrawable(icon);
if (info.isDisabled()) {
iconDrawable.setState(FastBitmapDrawable.State.DISABLED);
}
setIcon(iconDrawable);
setText(info.title);
if (info.contentDescription != null) {
setContentDescription(info.isDisabled()
? getContext().getString(R.string.disabled_app_label, info.contentDescription)
: info.contentDescription);
}
}
/**
* Used for measurement only, sets some dummy values on this view.
*/