Update assets to match the ux-assets unified email branch.

Change-Id: Icae27b2624a6835ebc45b2b0b3f1b138323f8ad7

14 files changed, 5 insertions, 158 deletions

diff --git a/res/drawable-hdpi/readme b/res/drawable-hdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-hdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-mdpi/readme b/res/drawable-mdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-mdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-sw600dp-hdpi/readme b/res/drawable-sw600dp-hdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-sw600dp-hdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-sw600dp-mdpi/readme b/res/drawable-sw600dp-mdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-sw600dp-mdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-sw600dp-xhdpi/readme b/res/drawable-sw600dp-xhdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-sw600dp-xhdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-sw600dp/readme b/res/drawable-sw600dp/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-sw600dp/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable-xhdpi/readme b/res/drawable-xhdpi/readme
deleted file mode 100644
index 140f7b4b4..000000000
--- a/res/drawable-xhdpi/readme
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedEmail directory creation
diff --git a/res/drawable/conversation_read_selector.xml b/res/drawable/conversation_read_selector.xml
deleted file mode 100644
index 705ea0981..000000000
--- a/res/drawable/conversation_read_selector.xml
+++ /dev/null
@@ -1,28 +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_focused="true"
-          android:drawable="@drawable/list_focused_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_selected_holo" />
-    <item android:drawable="@drawable/list_read_holo" />
-</selector>
diff --git a/res/drawable/conversation_unread_selector.xml b/res/drawable/conversation_unread_selector.xml
deleted file mode 100644
index 32f299483..000000000
--- a/res/drawable/conversation_unread_selector.xml
+++ /dev/null
@@ -1,28 +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_focused="true"
-          android:drawable="@drawable/list_focused_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_selected_holo" />
-    <item android:drawable="@drawable/list_unread_holo" />
-</selector>
diff --git a/res/drawable/conversation_wide_read_selector.xml b/res/drawable/conversation_wide_read_selector.xml
deleted file mode 100644
index d9ed25564..000000000
--- a/res/drawable/conversation_wide_read_selector.xml
+++ /dev/null
@@ -1,33 +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_focused="true"
-          android:drawable="@drawable/list_conversation_wide_read_focused_holo" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_read_pressed_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/list_conversation_wide_read_pressed_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_conversation_wide_read_selected_holo" />
-    <item android:state_selected="true"
-          android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_read_selected_holo" />
-    <item android:drawable="@drawable/list_conversation_wide_read_normal_holo" />
-</selector>
diff --git a/res/drawable/conversation_wide_unread_selector.xml b/res/drawable/conversation_wide_unread_selector.xml
deleted file mode 100644
index 832246581..000000000
--- a/res/drawable/conversation_wide_unread_selector.xml
+++ /dev/null
@@ -1,33 +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_focused="true"
-          android:drawable="@drawable/list_conversation_wide_unread_focused_holo" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_conversation_wide_unread_selected_holo" />
-    <item android:state_selected="true"
-          android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_unread_selected_holo" />
-    <item android:drawable="@drawable/list_conversation_wide_unread_normal_holo" />
-</selector>
diff --git a/res/drawable/send.xml b/res/drawable/send.xml
index 824f08521..3b62db574 100644
--- a/res/drawable/send.xml
+++ b/res/drawable/send.xml
@@ -1,22 +1,10 @@
 <?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.
+ * Copyright (c) 2010 Google Inc.
  */
 -->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true"
         android:drawable="@drawable/ic_menu_send_holo_light" />
diff --git a/res/drawable/trash.xml b/res/drawable/trash.xml
index 09dcfdbca..c87fc94c4 100644
--- a/res/drawable/trash.xml
+++ b/res/drawable/trash.xml
@@ -1,22 +1,10 @@
 <?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.
+ * Copyright (c) 2011 Google Inc.
  */
 -->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true"
         android:drawable="@drawable/ic_menu_trash_holo_light" />
diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml
index 1c9292065..b83cde025 100644
--- a/res/menu/compose_menu.xml
+++ b/res/menu/compose_menu.xml
@@ -21,7 +21,7 @@
 
     <item android:id="@+id/send"
         android:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_menu_send_holo_light"
+        android:icon="@drawable/send"
         android:title="@string/send"/>
 
     <item android:id="@+id/add_attachment"