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

Merge "Optimizations for ResolverActivity"

Browse Source
This commit is contained in:
Adam Powell
2013-05-30 01:43:32 +00:00
committed by Android (Google) Code Review
parent c7546a504e 0256c6f8d3
commit 087d2b2df7
2 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/ResolveInfo.java
View File

@@ -328,6 +328,7 @@ public class ResolveInfo implements Parcelable {
implements Comparator<ResolveInfo> {
public DisplayNameComparator(PackageManager pm) {
mPM = pm;
mCollator.setStrength(Collator.PRIMARY);
}
public final int compare(ResolveInfo a, ResolveInfo b) {
@@ -336,10 +337,10 @@ public class ResolveInfo implements Parcelable {
CharSequence sb = b.loadLabel(mPM);
if (sb == null) sb = b.activityInfo.name;
return sCollator.compare(sa.toString(), sb.toString());
return mCollator.compare(sa.toString(), sb.toString());
}
private final Collator sCollator = Collator.getInstance();
private final Collator mCollator = Collator.getInstance();
private PackageManager mPM;
}
}

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

@@ -16,6 +16,7 @@
package com.android.internal.app;
import android.os.AsyncTask;
import com.android.internal.R;
import com.android.internal.content.PackageMonitor;
@@ -621,9 +622,11 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
view = mInflater.inflate(
com.android.internal.R.layout.resolve_list_item, parent, false);
final ViewHolder holder = new ViewHolder(view);
view.setTag(holder);
// Fix the icon size even if we have different sized resources
ImageView icon = (ImageView)view.findViewById(R.id.icon);
ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) icon.getLayoutParams();
ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
lp.width = lp.height = mIconSize;
} else {
view = convertView;
@@ -633,20 +636,30 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
}
private final void bindView(View view, DisplayResolveInfo info) {
TextView text = (TextView)view.findViewById(com.android.internal.R.id.text1);
TextView text2 = (TextView)view.findViewById(com.android.internal.R.id.text2);
ImageView icon = (ImageView)view.findViewById(R.id.icon);
text.setText(info.displayLabel);
final ViewHolder holder = (ViewHolder) view.getTag();
holder.text.setText(info.displayLabel);
if (mShowExtended) {
text2.setVisibility(View.VISIBLE);
text2.setText(info.extendedInfo);
holder.text2.setVisibility(View.VISIBLE);
holder.text2.setText(info.extendedInfo);
} else {
text2.setVisibility(View.GONE);
holder.text2.setVisibility(View.GONE);
}
if (info.displayIcon == null) {
info.displayIcon = loadIconForResolveInfo(info.ri);
new LoadIconTask().execute(info);
}
icon.setImageDrawable(info.displayIcon);
holder.icon.setImageDrawable(info.displayIcon);
}
}
static class ViewHolder {
public TextView text;
public TextView text2;
public ImageView icon;
public ViewHolder(View view) {
text = (TextView) view.findViewById(com.android.internal.R.id.text1);
text2 = (TextView) view.findViewById(com.android.internal.R.id.text2);
icon = (ImageView) view.findViewById(R.id.icon);
}
}
@@ -660,5 +673,21 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
}
}
class LoadIconTask extends AsyncTask<DisplayResolveInfo, Void, DisplayResolveInfo> {
@Override
protected DisplayResolveInfo doInBackground(DisplayResolveInfo... params) {
final DisplayResolveInfo info = params[0];
if (info.displayIcon == null) {
info.displayIcon = loadIconForResolveInfo(info.ri);
}
return info;
}
@Override
protected void onPostExecute(DisplayResolveInfo info) {
mAdapter.notifyDataSetChanged();
}
}
}