PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix searching work app in settings NO PARTIAL RERUN

Browse Source 
am: 5651e0f2ce

Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
This commit is contained in:
Tony Mak
2017-06-15 22:29:04 +00:00
committed by android-build-merger
parent 0c02e22c99 5651e0f2ce
commit 80cdf176e9
4 changed files with 92 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/search2/AppSearchResult.java
View File

@@ -18,6 +18,7 @@
package com.android.settings.search2;
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;

10
src/com/android/settings/search2/IntentSearchViewHolder.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.search2;
import android.content.ComponentName;
import android.content.Intent;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;
@@ -51,7 +52,14 @@ public class IntentSearchViewHolder extends SearchViewHolder {
mMetricsFeatureProvider.action(v.getContext(),
MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
resultName, rank);
fragment.startActivity(intent);
// 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);
}
});
}
}

12
src/com/android/settings/search2/SearchViewHolder.java
View File

@@ -17,8 +17,11 @@ package com.android.settings.search2;
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;
@@ -44,6 +47,7 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
public final ImageView iconView;
protected final MetricsFeatureProvider mMetricsFeatureProvider;
private final IconDrawableFactory mIconDrawableFactory;
public SearchViewHolder(View view) {
super(view);
@@ -55,6 +59,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 void onBind(SearchFragment fragment, SearchResult result) {
@@ -72,7 +77,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);