am a2d65108: Merge "Latest UX asset drop." into klp-dev

* commit 'a2d65108dd32a0836fe08f0c72efdd5c727dad44':
  Latest UX asset drop.

packages/DocumentsUI/res/values-sw720dp/styles.xml

@@ -16,6 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="Theme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item>
         <item name="android:windowBackground">@*android:drawable/dialog_full_holo_light</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>

packages/DocumentsUI/res/values/styles.xml

@@ -29,5 +29,12 @@
 
     <!-- Normally just a redirection, but this is used to make ourselves a
          dialog on large tablets -->
-    <style name="Theme" parent="@android:style/Theme.Holo.Light" />
+    <style name="Theme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item>
+    </style>
+    
+    <style name="DarkerOverflow" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_menu_overflow</item>
+    </style>
+
 </resources>

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

@@ -781,7 +781,8 @@ public class DirectoryFragment extends Fragment {
                     iconMime.setImageDrawable(
                             IconUtils.loadPackageIcon(context, docAuthority, docIcon));
                 } else {
-                    iconMime.setImageDrawable(IconUtils.loadMimeIcon(context, docMimeType));
+                    iconMime.setImageDrawable(IconUtils.loadMimeIcon(
+                            context, docMimeType, docAuthority, docId, state.derivedMode));
                 }
             }
 

packages/DocumentsUI/src/com/android/documentsui/IconUtils.java

@@ -22,6 +22,7 @@ import android.content.pm.ProviderInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.provider.DocumentsContract.Document;
+import android.util.Log;
 
 import com.google.android.collect.Maps;
 
@@ -206,6 +207,27 @@ public class IconUtils {
         return null;
     }
 
+    public static Drawable loadMimeIcon(
+            Context context, String mimeType, String authority, String docId, int mode) {
+        final Resources res = context.getResources();
+
+        if (Document.MIME_TYPE_DIR.equals(mimeType)) {
+            // TODO: eventually move these hacky assets into that package
+            if ("com.android.providers.media.documents".equals(authority)
+                    && docId.startsWith("album")) {
+                return res.getDrawable(R.drawable.ic_doc_album);
+            }
+
+            if (mode == DocumentsActivity.State.MODE_GRID) {
+                return res.getDrawable(R.drawable.ic_grid_folder);
+            } else {
+                return res.getDrawable(R.drawable.ic_root_folder);
+            }
+        }
+
+        return loadMimeIcon(context, mimeType);
+    }
+
     public static Drawable loadMimeIcon(Context context, String mimeType) {
         final Resources res = context.getResources();
 
@@ -236,8 +258,7 @@ public class IconUtils {
         } else if ("video".equals(typeOnly)) {
             return res.getDrawable(R.drawable.ic_doc_video);
         } else {
-            // TODO: generic icon?
+            return res.getDrawable(R.drawable.ic_doc_generic);
-            return null;
         }
     }
 }

packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java

@@ -80,10 +80,10 @@ public class MimePredicate implements Predicate<DocumentInfo> {
     }
 
     public static boolean mimeMatches(String filter, String test) {
-        if (filter == null || "*/*".equals(filter)) {
+        if (test == null) {
-            return true;
-        } else if (test == null) {
             return false;
+        } else if (filter == null || "*/*".equals(filter)) {
+            return true;
         } else if (filter.equals(test)) {
             return true;
         } else if (filter.endsWith("/*")) {