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

Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2014-11-13 00:03:51 +00:00
committed by Android (Google) Code Review
parent 19865ccd44 ec452d9ff5
commit 377d80ba53
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,7 +840,7 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
} }
if (N > 1) { if (N > 1) {
Comparator<ResolveInfo> rComparator = Comparator<ResolveInfo> rComparator =
new ResolverComparator(ResolverActivity.this); new ResolverComparator(ResolverActivity.this, mIntent);
Collections.sort(currentResolveList, rComparator); Collections.sort(currentResolveList, rComparator);
} }
// First put the initial items at the top. // First put the initial items at the top.
@@ -1093,11 +1093,20 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
} }
} }
static final boolean isSpecificUriMatch(int match) {
match = match&IntentFilter.MATCH_CATEGORY_MASK;
return match >= IntentFilter.MATCH_CATEGORY_HOST
&& match <= IntentFilter.MATCH_CATEGORY_PATH;
}
class ResolverComparator implements Comparator<ResolveInfo> { class ResolverComparator implements Comparator<ResolveInfo> {
private final Collator mCollator; private final Collator mCollator;
private final boolean mHttp;
public ResolverComparator(Context context) { public ResolverComparator(Context context, Intent intent) {
mCollator = Collator.getInstance(context.getResources().getConfiguration().locale); mCollator = Collator.getInstance(context.getResources().getConfiguration().locale);
String scheme = intent.getScheme();
mHttp = "http".equals(scheme) || "https".equals(scheme);
} }
@Override @Override
@@ -1107,6 +1116,17 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
return 1; return 1;
} }
if (mHttp) {
// Special case: we want filters that match URI paths/schemes to be
// ordered before others. This is for the case when opening URIs,
// to make native apps go above browsers.
final boolean lhsSpecific = isSpecificUriMatch(lhs.match);
final boolean rhsSpecific = isSpecificUriMatch(rhs.match);
if (lhsSpecific != rhsSpecific) {
return lhsSpecific ? -1 : 1;
}
}
if (mStats != null) { if (mStats != null) {
final long timeDiff = final long timeDiff =
getPackageTimeSpent(rhs.activityInfo.packageName) - getPackageTimeSpent(rhs.activityInfo.packageName) -