Highlighting drawer items

Generalized folder_item.xml from drawable-sw600dp
to the normal drawable folder. Folders should now
be highlighted upon selection.

Bug: 8392574
Change-Id: Ic9fead22aa5b9b288ca0415e26213ca0ba6c87c6
diff --git a/res/drawable-sw600dp/folder_item.xml b/res/drawable-sw600dp/folder_item.xml
deleted file mode 100644
index 7632b33..0000000
--- a/res/drawable-sw600dp/folder_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
-    <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/folder_item.xml b/res/drawable/folder_item.xml
index f047291..7632b33 100644
--- a/res/drawable/folder_item.xml
+++ b/res/drawable/folder_item.xml
@@ -16,8 +16,8 @@
      limitations under the License.
 -->
 
-<!-- On phone we don't want to have an activated state. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
+    <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
     <item android:drawable="@android:color/transparent" />
 </selector>