Fix searching work app in settings

Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working

Fix: 62366873

Change-Id: I333372699b263d02cc4083289dc746c7aacd414d

src/com/android/settings/search/AppSearchResult.java

@@ -18,6 +18,7 @@
 package com.android.settings.search;
 
 import android.content.pm.ApplicationInfo;
+import android.os.UserHandle;
 
 public class AppSearchResult extends SearchResult {
     /**
@@ -30,6 +31,10 @@ public class AppSearchResult extends SearchResult {
         info = builder.mInfo;
     }
 
+    public UserHandle getAppUserHandle() {
+        return new UserHandle(UserHandle.getUserId(info.uid));
+    }
+
     public static class Builder extends SearchResult.Builder {
         protected ApplicationInfo mInfo;
 

src/com/android/settings/search/InstalledAppResultLoader.java

@@ -40,6 +40,7 @@ import com.android.settings.utils.AsyncLoader;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -99,7 +100,7 @@ public class InstalledAppResultLoader extends AsyncLoader<Set<? extends SearchRe
 
                 final AppSearchResult.Builder builder = new AppSearchResult.Builder();
                 builder.setAppInfo(info)
-                        .setStableId(info.packageName.hashCode())
+                        .setStableId(Objects.hash(info.packageName, user.id))
                         .setTitle(info.loadLabel(pm))
                         .setRank(getRank(wordDiff))
                         .addBreadcrumbs(getBreadCrumb())

src/com/android/settings/search/IntentSearchViewHolder.java

@@ -16,9 +16,11 @@
  */
 package com.android.settings.search;
 
+import android.content.Intent;
+import android.os.UserHandle;
 import android.view.View;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.logging.nano.MetricsProto;
 
 /**
  * ViewHolder for intent based search results.
@@ -32,7 +34,7 @@ public class IntentSearchViewHolder extends SearchViewHolder {
 
     @Override
     public int getClickActionMetricName() {
-        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
+        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
     }
 
     @Override
@@ -41,7 +43,15 @@ public class IntentSearchViewHolder extends SearchViewHolder {
 
         itemView.setOnClickListener(v -> {
            fragment.onSearchResultClicked(this, result);
-           fragment.startActivity(result.payload.getIntent());
+            final Intent intent = result.payload.getIntent();
+            // Use app user id to support work profile use case.
+            if (result instanceof AppSearchResult) {
+                AppSearchResult appResult = (AppSearchResult) result;
+                UserHandle userHandle = appResult.getAppUserHandle();
+                fragment.getActivity().startActivityAsUser(intent, userHandle);
+            } else {
+                fragment.startActivity(intent);
+            }
         });
     }
 }

src/com/android/settings/search/SearchViewHolder.java

@@ -18,8 +18,11 @@ package com.android.settings.search;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.IconDrawableFactory;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -46,6 +49,7 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
 
     protected final MetricsFeatureProvider mMetricsFeatureProvider;
     protected final SearchFeatureProvider mSearchFeatureProvider;
+    private final IconDrawableFactory mIconDrawableFactory;
 
     public SearchViewHolder(View view) {
         super(view);
@@ -59,6 +63,7 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
         breadcrumbView = view.findViewById(R.id.breadcrumb);
 
         mPlaceholderSummary = view.getContext().getString(R.string.summary_placeholder);
+        mIconDrawableFactory = IconDrawableFactory.newInstance(view.getContext());
     }
 
     public abstract int getClickActionMetricName();
@@ -78,7 +83,12 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
         if (result instanceof AppSearchResult) {
             AppSearchResult appResult = (AppSearchResult) result;
             PackageManager pm = fragment.getActivity().getPackageManager();
-            iconView.setImageDrawable(appResult.info.loadIcon(pm));
+            UserHandle userHandle = appResult.getAppUserHandle();
+            Drawable badgedIcon =
+                    mIconDrawableFactory.getBadgedIcon(appResult.info, userHandle.getIdentifier());
+            iconView.setImageDrawable(badgedIcon);
+            titleView.setContentDescription(
+                    pm.getUserBadgedLabel(appResult.info.loadLabel(pm), userHandle));
         } else {
             // Valid even when result.icon is null.
             iconView.setImageDrawable(result.icon);