summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-07-24 16:24:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:36:04 +0000
commit260065cac2443d0dd5159ac1f8c74380c2f1af59 (patch)
tree0def883352fb90742ec5e3b03a73826ee877173b
parentc956cbaee26c173ff3f9ec6625822b92dd07766f (diff)
parentd6fe52636dcaa96ec1e10ce2daebe98b820c9739 (diff)
downloadandroid_packages_apps_Trebuchet-260065cac2443d0dd5159ac1f8c74380c2f1af59.tar.gz
android_packages_apps_Trebuchet-260065cac2443d0dd5159ac1f8c74380c2f1af59.tar.bz2
android_packages_apps_Trebuchet-260065cac2443d0dd5159ac1f8c74380c2f1af59.zip
Merge "Change getBadgedLabelForUser to use CharSequence" into ub-now-master
-rw-r--r--src/com/android/launcher3/IconCache.java4
-rw-r--r--src/com/android/launcher3/ItemInfo.java2
-rw-r--r--src/com/android/launcher3/Launcher.java2
-rw-r--r--src/com/android/launcher3/ShortcutInfo.java2
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompat.java2
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompatV16.java2
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompatVL.java5
7 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 7d8628d9d..221df583b 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -64,8 +64,8 @@ public class IconCache {
private static class CacheEntry {
public Bitmap icon;
- public String title;
- public String contentDescription;
+ public CharSequence title;
+ public CharSequence contentDescription;
}
private static class CacheKey {
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index fe030171b..c726fb43f 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -110,7 +110,7 @@ public class ItemInfo {
/**
* Content description of the item.
*/
- String contentDescription;
+ CharSequence contentDescription;
/**
* The position of the item in a drag-and-drop operation.
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 718634d42..3cbe1c1dd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4929,7 +4929,7 @@ public class Launcher extends Activity
public ItemInfo createShortcutDragInfo(Intent shortcutIntent, CharSequence caption,
Bitmap icon, UserHandleCompat user) {
UserManagerCompat userManager = UserManagerCompat.getInstance(this);
- String contentDescription = userManager.getBadgedLabelForUser(caption.toString(), user);
+ CharSequence contentDescription = userManager.getBadgedLabelForUser(caption, user);
return new ShortcutInfo(shortcutIntent, caption, contentDescription, icon, user);
}
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index 266e9e07f..2d37ea291 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -126,7 +126,7 @@ public class ShortcutInfo extends ItemInfo {
}
}
- ShortcutInfo(Intent intent, CharSequence title, String contentDescription,
+ ShortcutInfo(Intent intent, CharSequence title, CharSequence contentDescription,
Bitmap icon, UserHandleCompat user) {
this();
this.intent = intent;
diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java
index c10a74307..8effb81a1 100644
--- a/src/com/android/launcher3/compat/UserManagerCompat.java
+++ b/src/com/android/launcher3/compat/UserManagerCompat.java
@@ -41,5 +41,5 @@ public abstract class UserManagerCompat {
public abstract long getSerialNumberForUser(UserHandleCompat user);
public abstract UserHandleCompat getUserForSerialNumber(long serialNumber);
public abstract Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user);
- public abstract String getBadgedLabelForUser(String label, UserHandleCompat user);
+ public abstract CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user);
}
diff --git a/src/com/android/launcher3/compat/UserManagerCompatV16.java b/src/com/android/launcher3/compat/UserManagerCompatV16.java
index 03dd0972c..32f972e85 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatV16.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatV16.java
@@ -45,7 +45,7 @@ public class UserManagerCompatV16 extends UserManagerCompat {
return 0;
}
- public String getBadgedLabelForUser(String label, UserHandleCompat user) {
+ public CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user) {
return label;
}
}
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java
index e071a8f71..da7b116d3 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java
@@ -49,11 +49,12 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
return mUserManager.getBadgedDrawableForUser(unbadged, user.getUser());
}
- public String getBadgedLabelForUser(String label, UserHandleCompat user) {
+ public CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user) {
if (user == null) {
return label;
}
- return mUserManager.getBadgedLabelForUser(label, user.getUser());
+ // TODO Remove casts when API has made it from lmp-dev -> sdk
+ return (CharSequence) mUserManager.getBadgedLabelForUser((String) label, user.getUser());
}
}