Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix searching work app in settings

Browse Source 
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
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d


Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a)
This commit is contained in:
Tony Mak
2017-06-12 18:02:53 +01:00
parent 4c930fc2d5
commit 9f3f5f4fed
6 changed files with 134 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/search/IntentSearchViewHolder.java
View File

@@ -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);
}
});
}
}