tree b8a2484c4a5937b324fc108cf1831b51e9fcbc8a
parent 90eb08d838b890d14a9af3a345899c074d6aa141
author Hai Zhang <zhanghai@google.com> 1558376566 -0700
committer Hai Zhang <zhanghai@google.com> 1558383072 -0700

Align badging logic with platform IconDrawableFactory.

The current logic in BaseIconFactory is only trying to add the user
badge if the user passed in isn't null and isn't the current user,
then if no such attempt is made, try to add an instant app badge. This
is causing user badge to disappear if the current user is a work
profile. Meanwhile, the badging logic in IconDrawableFactory is to try
to add the instant app badge first, and then always try to add the
user badge.

Bug: 132625654
Test: manually test as in b/128625591
Change-Id: Ia5b456f1f27095d546504266a1a90034105c9ae9