diff options
Diffstat (limited to 'src/com/android/launcher3/compat')
8 files changed, 3 insertions, 26 deletions
diff --git a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java index ec1fb669f..463278ab4 100644 --- a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java +++ b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java @@ -1,6 +1,7 @@ package com.android.launcher3.compat; import android.content.Context; + import com.android.launcher3.Utilities; import java.lang.reflect.Constructor; @@ -62,6 +63,7 @@ public class AlphabeticIndexCompat extends BaseAlphabeticIndex { private boolean mHasValidAlphabeticIndex; private String mDefaultMiscLabel; + @SuppressWarnings({"unchecked", "rawtypes"}) public AlphabeticIndexCompat(Context context) { super(); try { diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java index 07ef0efb7..0bc9588aa 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompat.java @@ -33,7 +33,6 @@ public abstract class LauncherActivityInfoCompat { public abstract Drawable getIcon(int density); public abstract ApplicationInfo getApplicationInfo(); public abstract long getFirstInstallTime(); - public abstract Drawable getBadgedIcon(int density); /** * Creates a LauncherActivityInfoCompat for the primary user. diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java index ea51aace8..fee0376bd 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java @@ -93,8 +93,4 @@ public class LauncherActivityInfoCompatV16 extends LauncherActivityInfoCompat { public String getName() { return mActivityInfo.name; } - - public Drawable getBadgedIcon(int density) { - return getIcon(density); - } } diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatVL.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatVL.java index 4448758e7..67c5c2795 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatVL.java @@ -55,8 +55,4 @@ public class LauncherActivityInfoCompatVL extends LauncherActivityInfoCompat { public long getFirstInstallTime() { return mLauncherActivityInfo.getFirstInstallTime(); } - - public Drawable getBadgedIcon(int density) { - return mLauncherActivityInfo.getBadgedIcon(density); - } } diff --git a/src/com/android/launcher3/compat/UserHandleCompat.java b/src/com/android/launcher3/compat/UserHandleCompat.java index 567022b43..94799089f 100644 --- a/src/com/android/launcher3/compat/UserHandleCompat.java +++ b/src/com/android/launcher3/compat/UserHandleCompat.java @@ -49,7 +49,7 @@ public class UserHandleCompat { } } - UserHandle getUser() { + public UserHandle getUser() { return mUser; } diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index f708004a3..6b7cba840 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -17,8 +17,6 @@ package com.android.launcher3.compat; import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; import com.android.launcher3.Utilities; @@ -54,7 +52,6 @@ public abstract class UserManagerCompat { public abstract List<UserHandleCompat> getUserProfiles(); public abstract long getSerialNumberForUser(UserHandleCompat user); public abstract UserHandleCompat getUserForSerialNumber(long serialNumber); - public abstract Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user); public abstract CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user); public abstract long getUserCreationTime(UserHandleCompat user); } diff --git a/src/com/android/launcher3/compat/UserManagerCompatV16.java b/src/com/android/launcher3/compat/UserManagerCompatV16.java index 85aee57e8..fcd755521 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatV16.java +++ b/src/com/android/launcher3/compat/UserManagerCompatV16.java @@ -16,8 +16,6 @@ package com.android.launcher3.compat; -import android.graphics.drawable.Drawable; - import java.util.ArrayList; import java.util.List; @@ -36,11 +34,6 @@ public class UserManagerCompatV16 extends UserManagerCompat { return UserHandleCompat.myUserHandle(); } - public Drawable getBadgedDrawableForUser(Drawable unbadged, - UserHandleCompat user) { - return unbadged; - } - public long getSerialNumberForUser(UserHandleCompat user) { return 0; } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index 98d5eca5f..c53d702b7 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -21,7 +21,6 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; import android.os.Build; import android.os.UserHandle; @@ -86,11 +85,6 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { } @Override - public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) { - return mPm.getUserBadgedIcon(unbadged, user.getUser()); - } - - @Override public CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user) { if (user == null) { return label; |