am 0c25d645: am c460444d: am a32f0bb0: am 816a43c9: Merge "New assets for the various empty icons" into ub-gmail-ur14-dev
* commit '0c25d645d48f18c85a23cb06e43aad8ca57ffcbb':
New assets for the various empty icons
diff --git a/res/drawable-hdpi/empty_folders.png b/res/drawable-hdpi/empty_folders.png
deleted file mode 100644
index 982a947..0000000
--- a/res/drawable-hdpi/empty_folders.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/empty_inbox.png b/res/drawable-hdpi/empty_inbox.png
deleted file mode 100644
index 98dacfc..0000000
--- a/res/drawable-hdpi/empty_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/empty_search.png b/res/drawable-hdpi/empty_search.png
deleted file mode 100644
index 976cb61..0000000
--- a/res/drawable-hdpi/empty_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/empty_spam.png b/res/drawable-hdpi/empty_spam.png
deleted file mode 100644
index 7c2198b..0000000
--- a/res/drawable-hdpi/empty_spam.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/empty_trash.png b/res/drawable-hdpi/empty_trash.png
deleted file mode 100644
index b0fa7e0..0000000
--- a/res/drawable-hdpi/empty_trash.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_empty_cv_120dp.png b/res/drawable-hdpi/ic_empty_default.png
similarity index 100%
rename from res/drawable-hdpi/ic_empty_cv_120dp.png
rename to res/drawable-hdpi/ic_empty_default.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_empty_inbox.png b/res/drawable-hdpi/ic_empty_inbox.png
new file mode 100644
index 0000000..f0623ec
--- /dev/null
+++ b/res/drawable-hdpi/ic_empty_inbox.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_empty_search.png b/res/drawable-hdpi/ic_empty_search.png
new file mode 100644
index 0000000..daea046
--- /dev/null
+++ b/res/drawable-hdpi/ic_empty_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_empty_spam.png b/res/drawable-hdpi/ic_empty_spam.png
new file mode 100644
index 0000000..5449bb5
--- /dev/null
+++ b/res/drawable-hdpi/ic_empty_spam.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_empty_trash.png b/res/drawable-hdpi/ic_empty_trash.png
new file mode 100644
index 0000000..4699709
--- /dev/null
+++ b/res/drawable-hdpi/ic_empty_trash.png
Binary files differ
diff --git a/res/drawable-mdpi/empty_folders.png b/res/drawable-mdpi/empty_folders.png
deleted file mode 100644
index 1a371cb..0000000
--- a/res/drawable-mdpi/empty_folders.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/empty_inbox.png b/res/drawable-mdpi/empty_inbox.png
deleted file mode 100644
index 3a51a60..0000000
--- a/res/drawable-mdpi/empty_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/empty_search.png b/res/drawable-mdpi/empty_search.png
deleted file mode 100644
index dde3765..0000000
--- a/res/drawable-mdpi/empty_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/empty_spam.png b/res/drawable-mdpi/empty_spam.png
deleted file mode 100644
index f5343d8..0000000
--- a/res/drawable-mdpi/empty_spam.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/empty_trash.png b/res/drawable-mdpi/empty_trash.png
deleted file mode 100644
index 87f6d92..0000000
--- a/res/drawable-mdpi/empty_trash.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_empty_cv_120dp.png b/res/drawable-mdpi/ic_empty_default.png
similarity index 100%
rename from res/drawable-mdpi/ic_empty_cv_120dp.png
rename to res/drawable-mdpi/ic_empty_default.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_empty_inbox.png b/res/drawable-mdpi/ic_empty_inbox.png
new file mode 100644
index 0000000..2784ae7
--- /dev/null
+++ b/res/drawable-mdpi/ic_empty_inbox.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_empty_search.png b/res/drawable-mdpi/ic_empty_search.png
new file mode 100644
index 0000000..c1fd890
--- /dev/null
+++ b/res/drawable-mdpi/ic_empty_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_empty_spam.png b/res/drawable-mdpi/ic_empty_spam.png
new file mode 100644
index 0000000..5f0ecec
--- /dev/null
+++ b/res/drawable-mdpi/ic_empty_spam.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_empty_trash.png b/res/drawable-mdpi/ic_empty_trash.png
new file mode 100644
index 0000000..385d2fe
--- /dev/null
+++ b/res/drawable-mdpi/ic_empty_trash.png
Binary files differ
diff --git a/res/drawable-v21/ic_empty_cv_120dp.xml b/res/drawable-v21/ic_empty_default.xml
similarity index 100%
rename from res/drawable-v21/ic_empty_cv_120dp.xml
rename to res/drawable-v21/ic_empty_default.xml
diff --git a/res/drawable-v21/ic_empty_inbox.xml b/res/drawable-v21/ic_empty_inbox.xml
new file mode 100644
index 0000000..5006751
--- /dev/null
+++ b/res/drawable-v21/ic_empty_inbox.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="120.0dp"
+ android:height="120.0dp"
+ android:viewportWidth="120.0"
+ android:viewportHeight="120.0">
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M120.0,35.147423L93.98335,26.017664L84.8535,0.0L60.00065,11.941811L35.146503,0.0L26.017946,26.017664L0.0,35.147423L11.94194,60.0L0.0,84.85258L26.017946,93.98234L35.146503,120.0L60.00065,108.05819L84.8535,120.0L93.98335,93.98234L120.0,84.85258L108.05936,60.0L120.0,35.147423L120.0,35.147423ZM60.87031,103.18841C37.49792,103.18841 18.550724,84.24271 18.550724,60.87031C18.550724,37.49792 37.49792,18.550724 60.87031,18.550724C84.24121,18.550724 103.18841,37.49792 103.18841,60.87031C103.18841,84.24271 84.24121,103.18841 60.87031,103.18841L60.87031,103.18841Z"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M48.11594,53.04348C48.11594,55.44596 46.168858,57.391304 43.76883,57.391304C41.364525,57.391304 39.420288,55.44596 39.420288,53.04348C39.420288,50.640995 41.364525,48.695652 43.76883,48.695652C46.168858,48.695652 48.11594,50.640995 48.11594,53.04348"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M79.42029,53.04348C79.42029,55.44596 77.474945,57.391304 75.072464,57.391304C72.66998,57.391304 70.72464,55.44596 70.72464,53.04348C70.72464,50.640995 72.66998,48.695652 75.072464,48.695652C77.474945,48.695652 79.42029,50.640995 79.42029,53.04348"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M59.960762,76.521736C56.727516,76.521736 53.628857,75.39135 51.46293,73.42202C50.239113,72.30343 50.085747,70.325676 51.12176,69.00493C52.159344,67.687546 53.991932,67.52077 55.222008,68.635994C57.469315,70.682816 62.54454,70.65586 64.74334,68.59556C65.95463,67.458435 67.795044,67.599945 68.848274,68.898796C69.90464,70.204384 69.77944,72.18214 68.56658,73.31757C66.39596,75.354294 63.25974,76.521736 59.960762,76.521736"/>
+</vector>
diff --git a/res/drawable-v21/ic_empty_search.xml b/res/drawable-v21/ic_empty_search.xml
new file mode 100644
index 0000000..98216aa
--- /dev/null
+++ b/res/drawable-v21/ic_empty_search.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="168.0dp"
+ android:height="120.0dp"
+ android:viewportWidth="168.0"
+ android:viewportHeight="120.0">
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M35.938198,120.0C16.121574,120.0 0.0,103.86999 0.0,84.04493C0.0,68.91421 9.302471,55.7046 23.126493,50.468014C22.787764,48.28352 22.617432,46.110645 22.617432,43.97069C22.617432,19.724356 42.33147,0.0 66.565125,0.0C83.85386,0.0 99.228294,9.981279 106.37451,25.34052C110.79348,23.556904 115.516335,22.629269 120.28371,22.629269C140.88037,22.629269 157.63489,39.394485 157.63489,60.0C157.63489,62.759666 157.32326,65.51546 156.7058,68.228645C163.75137,73.65503 168.0,82.118004 168.0,91.115486C168.0,106.55607 155.57928,119.38803 140.20872,119.961266C140.00935,119.98644 139.80612,120.0 139.60095,120.0L35.938198,120.0L35.938198,120.0ZM40.287903,110.27027L139.06424,110.27027C139.18796,110.25866 139.31363,110.25092 139.44122,110.248985C149.80159,110.04777 158.23256,101.4514 158.23256,91.08662C158.23256,84.26447 154.54582,77.89894 148.61263,74.47433C146.6233,73.32504 145.7166,70.93362 146.44157,68.75309C147.3966,65.8915 147.87993,62.946716 147.87993,60.0C147.87993,44.745945 135.48189,32.338 120.24003,32.338C115.337265,32.338 110.4925,33.66915 106.22772,36.190212C104.96336,36.938984 103.424484,37.07055 102.0538,36.546215C100.679245,36.025753 99.61788,34.905495 99.167435,33.504692C94.60493,19.283829 81.51092,9.72973 66.58611,9.72973C47.713573,9.72973 32.357647,25.096003 32.357647,43.985565C32.357647,46.783302 32.740433,49.67778 33.494408,52.589672C33.82113,53.8473 33.627804,55.184254 32.95696,56.298706C32.286118,57.41316 31.195755,58.2103 29.9314,58.510197C18.059217,61.327282 9.767442,71.817825 9.767442,84.02262C9.767442,98.49501 21.533295,110.27027 35.99605,110.27027C36.24931,110.27027 36.502567,110.264465 36.753895,110.25479L40.287903,110.27027L40.287903,110.27027Z"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M69.023254,60.648647C69.023254,63.695793 66.54541,66.16216 63.488373,66.16216C60.42942,66.16216 57.953487,63.695793 57.953487,60.648647C57.953487,57.603416 60.42942,55.135136 63.488373,55.135136C66.54541,55.135136 69.023254,57.603416 69.023254,60.648647"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M110.69768,60.648647C110.69768,63.695793 108.222176,66.16216 105.161835,66.16216C102.10532,66.16216 99.62791,63.695793 99.62791,60.648647C99.62791,57.603416 102.10532,55.135136 105.161835,55.135136C108.222176,55.135136 110.69768,57.603416 110.69768,60.648647"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M84.373985,81.72973C88.44683,81.72973 92.34686,83.08095 95.073616,85.430885C96.619415,86.76251 96.81144,89.12421 95.50759,90.69866C94.19798,92.271164 91.88984,92.46895 90.34212,91.13732C87.51167,88.69534 81.11916,88.72863 78.35208,91.19215C76.82356,92.54728 74.50774,92.37691 73.18085,90.82595C71.852036,89.27107 72.00949,86.90351 73.536095,85.55425C76.26861,83.12402 80.22048,81.72973 84.373985,81.72973"/>
+</vector>
diff --git a/res/drawable-v21/ic_empty_spam.xml b/res/drawable-v21/ic_empty_spam.xml
new file mode 100644
index 0000000..4dbaf53
--- /dev/null
+++ b/res/drawable-v21/ic_empty_spam.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="120.0dp"
+ android:height="120.0dp"
+ android:viewportWidth="120.0"
+ android:viewportHeight="120.0">
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M33.0,50.0C33.0,52.76334 30.760263,55.0 28.000866,55.0C25.236273,55.0 23.0,52.76334 23.0,50.0C23.0,47.23839 25.236273,45.0 28.000866,45.0C30.760263,45.0 33.0,47.23839 33.0,50.0"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M58.955223,50.0C58.955223,52.76334 56.718952,55.0 53.954357,55.0C51.19323,55.0 48.955223,52.76334 48.955223,50.0C48.955223,47.23839 51.19323,45.0 53.954357,45.0C56.718952,45.0 58.955223,47.23839 58.955223,50.0"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M118.40214,33.54919L86.4503,1.5996603C85.42752,0.57507694 84.03895,0.0 82.59031,0.0L37.407867,0.0C35.959236,0.0 34.572475,0.57507694 33.54788,1.5996603L1.5978646,33.54919C0.5732658,34.571953 0.0,35.96051 0.0,37.409122L0.0,82.59088C0.0,84.03949 0.5732658,85.42805 1.5978646,86.45081L33.54788,118.40034C34.572475,119.42493 35.959236,120.0 37.407867,120.0L82.59031,120.0C84.03895,120.0 85.42752,119.42493 86.4503,118.40034L118.40214,86.45081C119.426735,85.42805 120.0,84.03949 120.0,82.59088L120.0,37.409122C120.0,35.96051 119.426735,34.571953 118.40214,33.54919L118.40214,33.54919ZM97.4515,63.969006L90.632805,64.0L89.0,38.305336C89.0,38.305336 89.0,37.0 90.27443,37.0L97.915276,37.0C97.915276,37.0 99.09197,37.0 98.99423,38.49129L97.4515,63.969006L97.4515,63.969006ZM98.95522,74.00201C98.95522,76.76326 96.71648,79.0 93.95522,79.0C91.19397,79.0 88.95522,76.76326 88.95522,74.00201C88.95522,71.23875 91.19397,69.0 93.95522,69.0C96.71648,69.0 98.95522,71.23875 98.95522,74.00201L98.95522,74.00201ZM10.746268,79.978264L10.746268,39.424725L39.56125,10.746268L45.13528,10.746268C61.74612,20.92232 72.83582,39.159702 72.83582,59.99828C72.83582,80.44114 62.156513,98.37176 46.06733,108.656715L39.56125,108.656715L10.746268,79.978264L10.746268,79.978264Z"/>
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M40.008118,77.25373C36.96599,77.25373 34.052753,76.2115 32.013485,74.400154C30.86055,73.37279 30.71577,71.554 31.692146,70.34086C32.66852,69.127716 34.393513,68.97537 35.54998,70.000885C37.66517,71.88469 42.439346,71.85868 44.50863,69.96001C45.649204,68.915924 47.379494,69.045975 48.371758,70.24054C49.364025,71.43882 49.24573,73.26504 48.105152,74.305405C46.06412,76.179924 43.11204,77.25373 40.008118,77.25373"/>
+</vector>
diff --git a/res/drawable-v21/ic_empty_trash.xml b/res/drawable-v21/ic_empty_trash.xml
new file mode 100644
index 0000000..9cfc6e8
--- /dev/null
+++ b/res/drawable-v21/ic_empty_trash.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="130.0dp"
+ android:height="120.0dp"
+ android:viewportWidth="130.0"
+ android:viewportHeight="120.0">
+ <path
+ android:fillColor="#1e000000"
+ android:pathData="M127.455,70.688l-6.304,-14.125c-1.424,-3.191 -5.198,-4.638 -8.412,-3.226l-6.219,2.735c-8.479,-13.163 -18.638,-20.733 -25.286,-17.809l-2.082,0.916l2.323,-21.125c0.065,-0.348 0.106,-0.7 0.117,-1.054l0.007,-0.066l-0.004,0.0c0.002,-0.053 0.009,-0.105 0.009,-0.157C81.606,7.511 63.337,0.0 40.804,0.0C18.268,0.0 0.0,7.511 0.0,16.777c0.0,0.052 0.007,0.103 0.009,0.157L0.006,16.934L0.013,17.0c0.011,0.354 0.052,0.706 0.117,1.054l9.09,82.675l0.078,0.0c0.507,9.028 14.4,16.27 31.504,16.27c17.106,0.0 30.999,-7.242 31.506,-16.27l0.078,0.0l3.211,-29.204c1.114,3.773 2.544,7.681 4.302,11.624c9.125,20.451 23.442,33.989 31.976,30.238l2.407,-1.058c6.65,-2.923 7.825,-15.478 3.705,-30.554l6.219,-2.735C127.42,77.628 128.877,73.881 127.455,70.688L127.455,70.688zM41.001,32.0C22.223,32.0 7.0,26.179 7.0,18.999S22.223,6.0 41.001,6.0C59.779,6.0 75.0,11.82 75.0,18.999S59.779,32.0 41.001,32.0L41.001,32.0zM122.02,73.783l-5.646,2.467c-0.901,-2.612 -1.951,-5.269 -3.151,-7.947c-1.202,-2.675 -2.493,-5.228 -3.848,-7.645l5.644,-2.465c0.406,-0.177 0.888,0.004 1.067,0.409l6.345,14.127C122.611,73.134 122.427,73.606 122.02,73.783L122.02,73.783z"/>
+</vector>
diff --git a/res/drawable-xhdpi/empty_folders.png b/res/drawable-xhdpi/empty_folders.png
deleted file mode 100644
index fa43006..0000000
--- a/res/drawable-xhdpi/empty_folders.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/empty_inbox.png b/res/drawable-xhdpi/empty_inbox.png
deleted file mode 100644
index 6d830a5..0000000
--- a/res/drawable-xhdpi/empty_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/empty_search.png b/res/drawable-xhdpi/empty_search.png
deleted file mode 100644
index 0bee01d..0000000
--- a/res/drawable-xhdpi/empty_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/empty_spam.png b/res/drawable-xhdpi/empty_spam.png
deleted file mode 100644
index cca17fd..0000000
--- a/res/drawable-xhdpi/empty_spam.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/empty_trash.png b/res/drawable-xhdpi/empty_trash.png
deleted file mode 100644
index 831f3a8..0000000
--- a/res/drawable-xhdpi/empty_trash.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_empty_cv_120dp.png b/res/drawable-xhdpi/ic_empty_default.png
similarity index 100%
rename from res/drawable-xhdpi/ic_empty_cv_120dp.png
rename to res/drawable-xhdpi/ic_empty_default.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_empty_inbox.png b/res/drawable-xhdpi/ic_empty_inbox.png
new file mode 100644
index 0000000..029aeac
--- /dev/null
+++ b/res/drawable-xhdpi/ic_empty_inbox.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_empty_search.png b/res/drawable-xhdpi/ic_empty_search.png
new file mode 100644
index 0000000..6b2ad15
--- /dev/null
+++ b/res/drawable-xhdpi/ic_empty_search.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_empty_spam.png b/res/drawable-xhdpi/ic_empty_spam.png
new file mode 100644
index 0000000..61d86b3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_empty_spam.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_empty_trash.png b/res/drawable-xhdpi/ic_empty_trash.png
new file mode 100644
index 0000000..17641b0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_empty_trash.png
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_folders.png b/res/drawable-xxhdpi/empty_folders.png
deleted file mode 100644
index 13c13eb..0000000
--- a/res/drawable-xxhdpi/empty_folders.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_inbox.png b/res/drawable-xxhdpi/empty_inbox.png
deleted file mode 100644
index 436ab9a..0000000
--- a/res/drawable-xxhdpi/empty_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_search.png b/res/drawable-xxhdpi/empty_search.png
deleted file mode 100644
index 4be1823..0000000
--- a/res/drawable-xxhdpi/empty_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_spam.png b/res/drawable-xxhdpi/empty_spam.png
deleted file mode 100644
index b0a10a0..0000000
--- a/res/drawable-xxhdpi/empty_spam.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_trash.png b/res/drawable-xxhdpi/empty_trash.png
deleted file mode 100644
index a88ac17..0000000
--- a/res/drawable-xxhdpi/empty_trash.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_empty_cv_120dp.png b/res/drawable-xxhdpi/ic_empty_default.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_empty_cv_120dp.png
rename to res/drawable-xxhdpi/ic_empty_default.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_empty_inbox.png b/res/drawable-xxhdpi/ic_empty_inbox.png
new file mode 100644
index 0000000..718cbd9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_empty_inbox.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_empty_search.png b/res/drawable-xxhdpi/ic_empty_search.png
new file mode 100644
index 0000000..10708e2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_empty_search.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_empty_spam.png b/res/drawable-xxhdpi/ic_empty_spam.png
new file mode 100644
index 0000000..208118c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_empty_spam.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_empty_trash.png b/res/drawable-xxhdpi/ic_empty_trash.png
new file mode 100644
index 0000000..3ef44d0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_empty_trash.png
Binary files differ
diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml
index b9cd69f..327d29e 100644
--- a/res/layout/two_pane_activity.xml
+++ b/res/layout/two_pane_activity.xml
@@ -78,7 +78,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/ic_empty_cv_120dp"
android:visibility="gone" />
<include layout="@layout/conversation_pager"
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 17e7260..0173bf9 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -713,7 +713,7 @@
public boolean setupEmptyIconView(Folder folder, boolean isEmpty) {
if (mIsTabletLandscape) {
if (!isEmpty) {
- mEmptyCvView.setImageResource(R.drawable.ic_empty_cv_120dp);
+ mEmptyCvView.setImageResource(R.drawable.ic_empty_default);
} else {
EmptyStateUtils.bindEmptyFolderIcon(mEmptyCvView, folder);
}
diff --git a/src/com/android/mail/utils/EmptyStateUtils.java b/src/com/android/mail/utils/EmptyStateUtils.java
index c003a55..93435a2 100644
--- a/src/com/android/mail/utils/EmptyStateUtils.java
+++ b/src/com/android/mail/utils/EmptyStateUtils.java
@@ -35,17 +35,17 @@
*/
public static void bindEmptyFolderIcon(ImageView view, Folder folder) {
if (folder == null) {
- view.setImageResource(R.drawable.empty_folders);
+ view.setImageResource(R.drawable.ic_empty_default);
} else if (folder.isInbox()) {
- view.setImageResource(R.drawable.empty_inbox);
+ view.setImageResource(R.drawable.ic_empty_inbox);
} else if (folder.isSearch()) {
- view.setImageResource(R.drawable.empty_search);
+ view.setImageResource(R.drawable.ic_empty_search);
} else if (folder.isSpam()) {
- view.setImageResource(R.drawable.empty_spam);
+ view.setImageResource(R.drawable.ic_empty_spam);
} else if (folder.isTrash()) {
- view.setImageResource(R.drawable.empty_trash);
+ view.setImageResource(R.drawable.ic_empty_trash);
} else {
- view.setImageResource(R.drawable.empty_folders);
+ view.setImageResource(R.drawable.ic_empty_default);
}
}
