From 27e4bd4e0b29d937e8bc4393a8fdf504bde7449a Mon Sep 17 00:00:00 2001
From: onlymash <im@mash.im>
Date: Thu, 29 Mar 2018 15:14:33 +0800
Subject: [PATCH] merge background color to color.xml

---
 app/src/main/res/values/colors.xml                 | 2 ++
 app/src/main/res/values/ic_shortcut_background.xml | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 app/src/main/res/values/ic_shortcut_background.xml

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5bb42c6ac..cc17bdf75 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -114,4 +114,6 @@
     <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
     <color name="lock_pattern_view_error_color">@color/red_500</color>
 
+    <!--Shortcut Background-->
+    <color name="ic_shortcut_background">#F5F5F5</color>
 </resources>
diff --git a/app/src/main/res/values/ic_shortcut_background.xml b/app/src/main/res/values/ic_shortcut_background.xml
deleted file mode 100644
index d533a7125..000000000
--- a/app/src/main/res/values/ic_shortcut_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_shortcut_background">#F5F5F5</color>
-</resources>
\ No newline at end of file