From d3717155e959a2ed577b3590141a5bd6f7815f31 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 22 Feb 2013 00:15:04 +0100 Subject: [PATCH] Fix icon names Conflicts: OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java --- .../drawable-hdpi/large_menu_recording_layer.png | Bin 4227 -> 0 bytes .../small_menu_audio_video_notes.png | Bin 3576 -> 0 bytes .../plus/audionotes/AudioVideoNotesPlugin.java | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 OsmAnd/res/drawable-hdpi/large_menu_recording_layer.png delete mode 100644 OsmAnd/res/drawable-hdpi/small_menu_audio_video_notes.png diff --git a/OsmAnd/res/drawable-hdpi/large_menu_recording_layer.png b/OsmAnd/res/drawable-hdpi/large_menu_recording_layer.png deleted file mode 100644 index 9f90e97518614248c4dbd5444565d938e5785d9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4227 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 diff --git a/OsmAnd/res/drawable-hdpi/small_menu_audio_video_notes.png b/OsmAnd/res/drawable-hdpi/small_menu_audio_video_notes.png deleted file mode 100644 index f0822695b7980c461318545fa5d8f35f8c0b3cf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3576 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 diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 7849428077..24ea0cce1f 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -390,7 +390,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { } } }; - adapter.registerSelectedItem(R.string.layer_recordings, SHOW_RECORDINGS.get()? 1 : 0, R.drawable.large_menu_recording_layer, listener, 5); + adapter.registerSelectedItem(R.string.layer_recordings, SHOW_RECORDINGS.get()? 1 : 0, R.drawable.list_activities_rec_layer, listener, 5); } @Override @@ -441,7 +441,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { recordControl.setImageDrawable(activity.getResources().getDrawable(R.drawable.monitoring_rec_inactive)); setRecordListener(recordControl, activity); mapInfoLayer.getMapInfoControls().registerSideWidget(recordControl, - R.drawable.small_menu_audio_video_notes, R.string.map_widget_av_notes, "audionotes", false, + R.drawable.list_activities_rec_layer, R.string.map_widget_av_notes, "audionotes", false, EnumSet.allOf(ApplicationMode.class), EnumSet.noneOf(ApplicationMode.class), 22); mapInfoLayer.recreateControls();