diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-05-04 11:35:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-04 11:35:34 -0700 |
commit | 3ea5096568f147941b4302070ffc2024bad8e18f (patch) | |
tree | cd76ae29089ab62f8f6214f8b0b3b720a9bff619 /ui/src | |
parent | 2f39d81833807331c99d519f80b9eeb15ada4291 (diff) | |
parent | 3843960b466dbcd1733648095e750ccb3fa6d184 (diff) | |
download | android_packages_providers_DownloadProvider-3ea5096568f147941b4302070ffc2024bad8e18f.tar.gz android_packages_providers_DownloadProvider-3ea5096568f147941b4302070ffc2024bad8e18f.tar.bz2 android_packages_providers_DownloadProvider-3ea5096568f147941b4302070ffc2024bad8e18f.zip |
Merge "Updated layout for download items." into jb-dev
Diffstat (limited to 'ui/src')
-rw-r--r-- | ui/src/com/android/providers/downloads/ui/DownloadAdapter.java | 17 | ||||
-rw-r--r-- | ui/src/com/android/providers/downloads/ui/DownloadItem.java | 3 |
2 files changed, 14 insertions, 6 deletions
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java b/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java index 27967f8a..9ce2a986 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java @@ -107,8 +107,15 @@ public class DownloadAdapter extends CursorAdapter { setTextForView(convertView, R.id.download_title, title); setTextForView(convertView, R.id.domain, mCursor.getString(mDescriptionColumnId)); setTextForView(convertView, R.id.size_text, getSizeText()); - setTextForView(convertView, R.id.status_text, mResources.getString(getStatusStringId())); - setTextForView(convertView, R.id.last_modified_date, getDateString()); + + final int status = mCursor.getInt(mStatusColumnId); + final CharSequence statusText; + if (status == DownloadManager.STATUS_SUCCESSFUL) { + statusText = getDateString(); + } else { + statusText = mResources.getString(getStatusStringId(status)); + } + setTextForView(convertView, R.id.status_text, statusText); ((DownloadItem) convertView).getCheckBox() .setChecked(mDownloadList.isDownloadSelected(downloadId)); @@ -141,8 +148,8 @@ public class DownloadAdapter extends CursorAdapter { return sizeText; } - private int getStatusStringId() { - switch (mCursor.getInt(mStatusColumnId)) { + private int getStatusStringId(int status) { + switch (status) { case DownloadManager.STATUS_FAILED: return R.string.download_error; @@ -189,7 +196,7 @@ public class DownloadAdapter extends CursorAdapter { iconView.setVisibility(View.VISIBLE); } - private void setTextForView(View parent, int textViewId, String text) { + private void setTextForView(View parent, int textViewId, CharSequence text) { TextView view = (TextView) parent.findViewById(textViewId); view.setText(text); } diff --git a/ui/src/com/android/providers/downloads/ui/DownloadItem.java b/ui/src/com/android/providers/downloads/ui/DownloadItem.java index 4cbcd332..25f58638 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadItem.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadItem.java @@ -21,6 +21,7 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.CheckBox; import android.widget.Checkable; +import android.widget.GridLayout; import android.widget.RelativeLayout; /** @@ -29,7 +30,7 @@ import android.widget.RelativeLayout; * also keeps an ID associated with the currently displayed download and notifies a listener upon * selection changes with that ID. */ -public class DownloadItem extends RelativeLayout implements Checkable { +public class DownloadItem extends GridLayout implements Checkable { private static float CHECKMARK_AREA = -1; private boolean mIsInDownEvent = false; |