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

Merge "Correctly determine when to show details cell." into nyc-dev

Browse Source
This commit is contained in:
Steve McKay
2016-03-03 03:21:25 +00:00
committed by Android (Google) Code Review
parent 3896412dd4 1c1219b250
commit 3b8db2dc0e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/DocumentsUI/src/com/android/documentsui/dirlist/ListDocumentHolder.java
View File

@@ -123,20 +123,20 @@ final class ListDocumentHolder extends DocumentHolder {
mSummary.setVisibility(View.INVISIBLE); mSummary.setVisibility(View.INVISIBLE);
} }
if (docLastModified == -1) { if (docLastModified > 0) {
hasDetails = true; hasDetails = true;
mDate.setText(null);
} else {
mDate.setText(Shared.formatTime(mContext, docLastModified)); mDate.setText(Shared.formatTime(mContext, docLastModified));
} else {
mDate.setText(null);
} }
if (!state.showSize || docSize == -1) { if (state.showSize && docSize > -1) {
hasDetails = true; hasDetails = true;
mSize.setVisibility(View.GONE);
mDetails.setVisibility(View.GONE);
} else {
mSize.setVisibility(View.VISIBLE); mSize.setVisibility(View.VISIBLE);
mSize.setText(Formatter.formatFileSize(mContext, docSize)); mSize.setText(Formatter.formatFileSize(mContext, docSize));
} else {
mSize.setVisibility(View.GONE);
mDetails.setVisibility(View.GONE);
} }
mDetails.setVisibility(hasDetails ? View.VISIBLE : View.GONE); mDetails.setVisibility(hasDetails ? View.VISIBLE : View.GONE);
} }