From 6eff36c1a7d10b1bef02a63b4822840a948eb80b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 17 Oct 2020 16:12:38 +0200 Subject: [PATCH] Fix duplicate resource build error Move drawable-anydpi-v24 xmls to drawable-v24 Change-Id: I48aa8efb013715802cc87da0c43509dbda4ac5c8 --- .../bg_breadcrumbs_typing.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_camera.xml | 0 .../res/{drawable-anydpi-v24 => drawable-v24}/ic_check_on.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_filter.xml | 0 .../{drawable-anydpi-v24 => drawable-v24}/ic_material_share.xml | 0 .../res/{drawable-anydpi-v24 => drawable-v24}/ic_plus_circle.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_search.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_send.xml | 0 .../ic_settings_root_advanced.xml | 0 .../ic_settings_root_call.xml | 0 .../ic_settings_root_flair.xml | 0 .../ic_settings_root_general.xml | 0 .../ic_settings_root_help_about.xml | 0 .../ic_settings_root_ignored_users.xml | 0 .../ic_settings_root_labs.xml | 0 .../ic_settings_root_legacy.xml | 0 .../ic_settings_root_notification.xml | 0 .../ic_settings_root_preferences.xml | 0 .../ic_settings_root_security_privacy.xml | 0 .../{drawable-anydpi-v24 => drawable-v24}/ic_shield_custom.xml | 0 .../{drawable-anydpi-v24 => drawable-v24}/ic_shield_trusted.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_x_18dp.xml | 0 .../main/res/{drawable-anydpi-v24 => drawable-v24}/ic_x_green.xml | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/bg_breadcrumbs_typing.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_camera.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_check_on.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_filter.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_material_share.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_plus_circle.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_search.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_send.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_advanced.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_call.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_flair.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_general.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_help_about.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_ignored_users.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_labs.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_legacy.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_notification.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_preferences.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_settings_root_security_privacy.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_shield_custom.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_shield_trusted.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_x_18dp.xml (100%) rename vector/src/main/res/{drawable-anydpi-v24 => drawable-v24}/ic_x_green.xml (100%) diff --git a/vector/src/main/res/drawable-anydpi-v24/bg_breadcrumbs_typing.xml b/vector/src/main/res/drawable-v24/bg_breadcrumbs_typing.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/bg_breadcrumbs_typing.xml rename to vector/src/main/res/drawable-v24/bg_breadcrumbs_typing.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_camera.xml b/vector/src/main/res/drawable-v24/ic_camera.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_camera.xml rename to vector/src/main/res/drawable-v24/ic_camera.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_check_on.xml b/vector/src/main/res/drawable-v24/ic_check_on.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_check_on.xml rename to vector/src/main/res/drawable-v24/ic_check_on.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_filter.xml b/vector/src/main/res/drawable-v24/ic_filter.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_filter.xml rename to vector/src/main/res/drawable-v24/ic_filter.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_material_share.xml b/vector/src/main/res/drawable-v24/ic_material_share.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_material_share.xml rename to vector/src/main/res/drawable-v24/ic_material_share.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_plus_circle.xml b/vector/src/main/res/drawable-v24/ic_plus_circle.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_plus_circle.xml rename to vector/src/main/res/drawable-v24/ic_plus_circle.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_search.xml b/vector/src/main/res/drawable-v24/ic_search.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_search.xml rename to vector/src/main/res/drawable-v24/ic_search.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_send.xml b/vector/src/main/res/drawable-v24/ic_send.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_send.xml rename to vector/src/main/res/drawable-v24/ic_send.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_advanced.xml b/vector/src/main/res/drawable-v24/ic_settings_root_advanced.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_advanced.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_advanced.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_call.xml b/vector/src/main/res/drawable-v24/ic_settings_root_call.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_call.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_call.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_flair.xml b/vector/src/main/res/drawable-v24/ic_settings_root_flair.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_flair.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_flair.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_general.xml b/vector/src/main/res/drawable-v24/ic_settings_root_general.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_general.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_general.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_help_about.xml b/vector/src/main/res/drawable-v24/ic_settings_root_help_about.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_help_about.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_help_about.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_ignored_users.xml b/vector/src/main/res/drawable-v24/ic_settings_root_ignored_users.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_ignored_users.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_ignored_users.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_labs.xml b/vector/src/main/res/drawable-v24/ic_settings_root_labs.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_labs.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_labs.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_legacy.xml b/vector/src/main/res/drawable-v24/ic_settings_root_legacy.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_legacy.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_legacy.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_notification.xml b/vector/src/main/res/drawable-v24/ic_settings_root_notification.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_notification.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_notification.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_preferences.xml b/vector/src/main/res/drawable-v24/ic_settings_root_preferences.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_preferences.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_preferences.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable-v24/ic_settings_root_security_privacy.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_settings_root_security_privacy.xml rename to vector/src/main/res/drawable-v24/ic_settings_root_security_privacy.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_shield_custom.xml b/vector/src/main/res/drawable-v24/ic_shield_custom.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_shield_custom.xml rename to vector/src/main/res/drawable-v24/ic_shield_custom.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_shield_trusted.xml b/vector/src/main/res/drawable-v24/ic_shield_trusted.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_shield_trusted.xml rename to vector/src/main/res/drawable-v24/ic_shield_trusted.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_x_18dp.xml b/vector/src/main/res/drawable-v24/ic_x_18dp.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_x_18dp.xml rename to vector/src/main/res/drawable-v24/ic_x_18dp.xml diff --git a/vector/src/main/res/drawable-anydpi-v24/ic_x_green.xml b/vector/src/main/res/drawable-v24/ic_x_green.xml similarity index 100% rename from vector/src/main/res/drawable-anydpi-v24/ic_x_green.xml rename to vector/src/main/res/drawable-v24/ic_x_green.xml