apps/bitmaps: Replace pseudo-native default icons with mono ones.

The old icons looked exactly like the mono version, and all >1 bpp drivers
support rendering mono bitmaps. Therefore a mono bitmap can be used which
requires less ram.

This affects only the builtin icons, not the ones used by cabbiev2.

Change-Id: I3b02b5b04fe8b4bcc69e83310871254d336b648a

9 files changed, 8 insertions, 11 deletions

diff --git a/apps/bitmaps/mono/SOURCES b/apps/bitmaps/mono/SOURCES
index 2dccf2ad4f..c0f72c023a 100644
--- a/apps/bitmaps/mono/SOURCES
+++ b/apps/bitmaps/mono/SOURCES
@@ -1,3 +1,7 @@
+#ifdef HAVE_LCD_BITMAP
+default_icons.bmp
+#endif
+
 #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 osx_dummy.bmp
 #endif
diff --git a/apps/bitmaps/native/default_icons.6x8x1.bmp b/apps/bitmaps/mono/default_icons.bmp
index 857b1e1d7b..857b1e1d7b 100644
--- a/apps/bitmaps/native/default_icons.6x8x1.bmp
+++ b/apps/bitmaps/mono/default_icons.bmp
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index d910dd5c06..9479f3e933 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -64,15 +64,6 @@ usblogo.104x27x1.bmp
 #endif
 #endif
 
-/* List Icons */
-#if LCD_DEPTH == 16
-default_icons.6x8x16.bmp
-#elif LCD_DEPTH > 1 /* greyscale */
-default_icons.6x8x2.bmp
-#else
-default_icons.6x8x1.bmp
-#endif
-
 #endif /* BOOTLOADER */
 
 #endif /* HAVE_LCD_BITMAP */
diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp
deleted file mode 100644
index dad29b2e50..0000000000
--- a/apps/bitmaps/native/default_icons.6x8x16.bmp
+++ /dev/null
diff --git a/apps/bitmaps/remote_mono/SOURCES b/apps/bitmaps/remote_mono/SOURCES
index 75f641fd95..41d85fccff 100644
--- a/apps/bitmaps/remote_mono/SOURCES
+++ b/apps/bitmaps/remote_mono/SOURCES
@@ -1,3 +1,7 @@
+#ifdef HAVE_LCD_BITMAP
+remote_default_icons.bmp
+#endif
+
 #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 osx_remote_dummy.bmp
 #endif
diff --git a/apps/bitmaps/native/default_icons.6x8x2.bmp b/apps/bitmaps/remote_mono/remote_default_icons.bmp
index 857b1e1d7b..857b1e1d7b 100644
--- a/apps/bitmaps/native/default_icons.6x8x2.bmp
+++ b/apps/bitmaps/remote_mono/remote_default_icons.bmp
diff --git a/apps/bitmaps/remote_native/SOURCES b/apps/bitmaps/remote_native/SOURCES
index 02d1b542b2..6350c4eba1 100644
--- a/apps/bitmaps/remote_native/SOURCES
+++ b/apps/bitmaps/remote_native/SOURCES
@@ -5,11 +5,9 @@
 #if (LCD_REMOTE_DEPTH == 1)
 remote_rockboxlogo.128x42x1.bmp
 remote_usblogo.104x27x1.bmp
-remote_default_icons.6x8x1.bmp
 #elif (LCD_REMOTE_DEPTH == 2)
 remote_rockboxlogo.128x42x2.bmp
 remote_usblogo.104x27x2.bmp
-remote_default_icons.6x8x2.bmp
 #endif
 
 #endif /* BOOTLOADER */
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp
deleted file mode 100644
index 857b1e1d7b..0000000000
--- a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp
+++ /dev/null
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp
deleted file mode 100644
index 857b1e1d7b..0000000000
--- a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp
+++ /dev/null