commit 696f6da4a1f9d437eb7f5560c81408ee1f95e2db
author Ben Kwa <kenobi@google.com> Thu Dec 10 17:21:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 10 17:21:55 2015 +0000
tree 50812c1a0ccd0cf4e11fe84cc66e2a8f46731814
parent 3b9cac0dc785706e1ac48c992bd354cf6a6d5214
parent 8903eb0d19de2b14d515c4f820eac72916a569bd

Merge "Fix selection highlights."

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

diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 2d77c6a..770d011 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -316,12 +316,8 @@
         mAdapter = new DocumentsAdapter(context);
         mRecView.setAdapter(mAdapter);
 
-        mDefaultItemColor = context.getResources().getColor(android.R.color.transparent);
-        // Get the accent color.
-        TypedValue selColor = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorAccent, selColor, true);
-        // Set the opacity to 10%.
-        mSelectedItemColor = (selColor.data & 0x00ffffff) | 0x16000000;
+        mDefaultItemColor = context.getResources().getColor(R.color.item_doc_background);
+        mSelectedItemColor = context.getResources().getColor(R.color.item_doc_background_selected);
 
         GestureDetector.SimpleOnGestureListener listener =
                 new GestureDetector.SimpleOnGestureListener() {
@@ -943,6 +939,7 @@
 
         public void setSelected(boolean selected) {
             itemView.setActivated(selected);
+            itemView.setBackgroundColor(selected ? mSelectedItemColor : mDefaultItemColor);
         }
 
         @Override