diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-08 13:08:56 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@google.com> | 2014-08-08 22:22:39 +0000 |
| commit | c29dd61cbfc9f073239bdce3f4fe397deae2c623 (patch) | |
| tree | 425647513c9d779b7ea37a4b403b4bfa71083add /packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java | |
| parent | 06629c1f2ef25079588783e5495ccc4e6c3bb856 (diff) | |
| download | frameworks_base-c29dd61cbfc9f073239bdce3f4fe397deae2c623.zip frameworks_base-c29dd61cbfc9f073239bdce3f4fe397deae2c623.tar.gz frameworks_base-c29dd61cbfc9f073239bdce3f4fe397deae2c623.tar.bz2 | |
More material updates to DocumentsUI.
All assets cut as alpha variants so we apply desired tinting at
runtime. Small script to automatically generate XML resources.
Bug: 15836082, 16658537
Change-Id: I803b3f0bf6f121194a5445fd1c6600fabaf28f60
Diffstat (limited to 'packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 001cac4..0a7eedc 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -70,7 +70,6 @@ import android.widget.AbsListView.RecyclerListener; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; -import android.widget.FrameLayout; import android.widget.GridView; import android.widget.ImageView; import android.widget.ListView; @@ -705,11 +704,11 @@ public class DirectoryFragment extends Fragment { if (extras != null) { final String info = extras.getString(DocumentsContract.EXTRA_INFO); if (info != null) { - mFooters.add(new MessageFooter(2, R.drawable.ic_dialog_info_dark, info)); + mFooters.add(new MessageFooter(2, R.drawable.ic_dialog_info, info)); } final String error = extras.getString(DocumentsContract.EXTRA_ERROR); if (error != null) { - mFooters.add(new MessageFooter(3, R.drawable.ic_dialog_alert_dark, error)); + mFooters.add(new MessageFooter(3, R.drawable.ic_dialog_alert, error)); } if (extras.getBoolean(DocumentsContract.EXTRA_LOADING, false)) { mFooters.add(new LoadingFooter()); @@ -718,7 +717,7 @@ public class DirectoryFragment extends Fragment { if (result != null && result.exception != null) { mFooters.add(new MessageFooter( - 3, R.drawable.ic_dialog_alert_dark, getString(R.string.query_error))); + 3, R.drawable.ic_dialog_alert, getString(R.string.query_error))); } if (isEmpty()) { @@ -854,7 +853,7 @@ public class DirectoryFragment extends Fragment { // be shown, so this will never block. final RootInfo root = roots.getRootBlocking(docAuthority, docRootId); if (state.derivedMode == MODE_GRID) { - iconDrawable = root.loadLightIcon(context); + iconDrawable = root.loadGridIcon(context); } else { iconDrawable = root.loadIcon(context); } @@ -883,8 +882,8 @@ public class DirectoryFragment extends Fragment { // hint to remind user they're a directory. if (Document.MIME_TYPE_DIR.equals(docMimeType) && state.derivedMode == MODE_GRID && showThumbnail) { - iconDrawable = context.getResources().getDrawable( - R.drawable.ic_root_folder_light); + iconDrawable = IconUtils.applyTint(context, R.drawable.ic_doc_folder, + android.R.attr.textColorPrimaryInverse); } if (summary != null) { |
