diff --git a/res/drawable/ic_cab_done_holo_dark.png b/res/drawable/ic_cab_done_holo_dark.png
deleted file mode 100644
index 2e06dd01b..000000000
Binary files a/res/drawable/ic_cab_done_holo_dark.png and /dev/null differ
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 5f5dcd350..12973157b 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -24,28 +24,6 @@
android:layout_centerVertical="true"
android:baselineAligned="false" >
-
-
-
-
-
-
-
-
0 && showStatusInstalled()) {
- iconInstalled.setVisibility(View.VISIBLE);
- } else {
- iconInstalled.setVisibility(View.GONE);
- }
- }
+ status.setText(getVersionInfo(app));
+ license.setText(app.license);
// Disable it all if it isn't compatible...
View[] views = { convertView, status, summary, license, name };
@@ -148,31 +124,26 @@ abstract public class AppListAdapter extends BaseAdapter {
return input.substring(0, maxLength) + "…";
}
- private SpannableString getVersionInfo(DB.App app) {
+ private String getVersionInfo(DB.App app) {
if (app.curApk == null) {
return null;
}
if (app.installedVersion == null) {
- return new SpannableString(
- ellipsize(app.curApk.version, 12));
+ return ellipsize(app.curApk.version, 12);
}
- SpannableString span;
- String cur;
-
- if (app.toUpdate) {
- cur = ellipsize(app.installedVersion, 8);
- span = new SpannableString(
- cur + " → " + ellipsize(app.curApk.version, 8));
- } else {
- cur = ellipsize(app.installedVersion, 12);
- span = new SpannableString(cur);
+ if (app.toUpdate && showStatusUpdate()) {
+ return ellipsize(app.installedVersion, 8) +
+ " → " + ellipsize(app.curApk.version, 8);
}
- span.setSpan(new StyleSpan(Typeface.BOLD), 0, cur.length(), 0);
- return span;
+ if (app.installedVerCode > 0 && showStatusInstalled()) {
+ return ellipsize(app.installedVersion, 12) + " ✔";
+ }
+
+ return app.installedVersion;
}
private void layoutIcon(ImageView icon, boolean compact) {