commit 34c5409fb31d0aae417db265dce4f49ee8a93227
author Jeff Sharkey <jsharkey@android.com> Fri Aug 08 13:08:56 2014 -0700
committer Jeff Sharkey <jsharkey@google.com> Fri Aug 08 22:22:39 2014 +0000
tree e54a577f1a3378d221a3ca2251321fab0b75434a
parent cb8fac398a8b35dae2c64c7c97e5b34ebf8df297

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

src/com/android/documentsui/DirectoryFragment.java

diff --git a/src/com/android/documentsui/DirectoryFragment.java b/src/com/android/documentsui/DirectoryFragment.java
index 001cac4..0a7eedc 100644
--- a/src/com/android/documentsui/DirectoryFragment.java
+++ b/src/com/android/documentsui/DirectoryFragment.java
@@ -70,7 +70,6 @@
 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 @@
             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 @@
 
             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 @@
                 // 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 @@
                 // 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) {