Merge "Don't use cached app icon in app info page." into pi-dev

am: 7312f55549

Change-Id: I3f196276bca134df35d0c723ae637354f5214744
This commit is contained in:
Fan Zhang
2018-05-18 16:08:08 -07:00
committed by android-build-merger
3 changed files with 59 additions and 6 deletions

View File

@@ -35,6 +35,7 @@ import android.support.annotation.IntDef;
import android.support.annotation.VisibleForTesting;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -146,9 +147,7 @@ public class EntityHeaderController {
* accessibility purposes.
*/
public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
if (appEntry.icon != null) {
mIcon = appEntry.icon.getConstantState().newDrawable(mAppContext.getResources());
}
mIcon = IconDrawableFactory.newInstance(mAppContext).getBadgedIcon(appEntry.info);
return this;
}