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

Merge "Move the check for launcher managed profile support."

Browse Source
This commit is contained in:
Sander Alewijnse
2015-02-09 10:17:56 +00:00
committed by Android (Google) Code Review
parent 6de4c88271 86d35ba5d5
commit 8f6afec2aa
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -505,15 +505,6 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
// Header views don't count.
return;
}
ResolveInfo resolveInfo = mAdapter.resolveInfoForPosition(position, true);
if (mResolvingHome && hasManagedProfile()
&& !supportsManagedProfiles(resolveInfo)) {
Toast.makeText(this, String.format(getResources().getString(
com.android.internal.R.string.activity_resolver_work_profiles_support),
resolveInfo.activityInfo.loadLabel(getPackageManager()).toString()),
Toast.LENGTH_LONG).show();
return;
}
final int checkedPos = mListView.getCheckedItemPosition();
final boolean hasValidSelection = checkedPos != ListView.INVALID_POSITION;
if (mAlwaysUseOption && (!hasValidSelection || mLastSelected != checkedPos)) {
@@ -579,7 +570,6 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
mListView.getCheckedItemPosition() : mAdapter.getFilteredPosition(),
id == R.id.button_always,
mAlwaysUseOption);
dismiss();
}
void startSelected(int which, boolean always, boolean filtered) {
@@ -587,6 +577,14 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
return;
}
ResolveInfo ri = mAdapter.resolveInfoForPosition(which, filtered);
if (mResolvingHome && hasManagedProfile() && !supportsManagedProfiles(ri)) {
Toast.makeText(this, String.format(getResources().getString(
com.android.internal.R.string.activity_resolver_work_profiles_support),
ri.activityInfo.loadLabel(getPackageManager()).toString()),
Toast.LENGTH_LONG).show();
return;
}
Intent intent = mAdapter.intentForPosition(which, filtered);
onIntentSelected(ri, intent, always);
finish();