summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/DocumentsUI/res/color/item_doc_grid_overlay.xml6
-rw-r--r--packages/DocumentsUI/res/color/item_doc_list_background_activated.xml4
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java4
3 files changed, 13 insertions, 1 deletions
diff --git a/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml
index 6dcbb38cb950..ab414a9bb6af 100644
--- a/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml
+++ b/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml
@@ -16,6 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
+ android:state_focused="true"
+ android:color="@color/platform_blue_a200"
+ android:alpha="0.1" />
+ <item
android:state_activated="true"
android:color="?android:attr/colorAccent"
android:alpha="0.1" />
@@ -25,4 +29,4 @@
android:alpha="0.5" />
<item
android:color="@android:color/transparent" />
-</selector> \ No newline at end of file
+</selector>
diff --git a/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml b/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml
index 7d7a110864d9..90e2b7e653c6 100644
--- a/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml
+++ b/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml
@@ -16,6 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
+ android:state_focused="true"
+ android:color="@color/platform_blue_a200"
+ android:alpha="0.1" />
+ <item
android:state_activated="true"
android:color="?android:attr/colorAccent"
android:alpha="0.1" />
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index 0abbf4e4996f..008c03b75221 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -873,6 +873,10 @@ public class DirectoryFragment extends Fragment {
public DocumentHolder(View view) {
super(view);
this.view = view;
+ // Setting this using android:focusable in the item layouts doesn't work for list items.
+ // So we set it here. Note that touch mode focus is a separate issue - see
+ // View.setFocusableInTouchMode and View.isInTouchMode for more info.
+ this.view.setFocusable(true);
}
}