From ec31a01004752d3499413f995d875e3e04c97f88 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Wed, 29 Nov 2017 12:27:52 +0530
Subject: [PATCH] Cherish: Make roaming indicator optional [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I632fd55d508128949b66553a8d05ce90d31e3529
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/drawable/ic_roaming.xml            | 9 +++++++++
 res/values-vi/cherish_strings.xml      | 3 +++
 res/values/cherish_strings.xml         | 4 ++++
 res/xml/cherish_settings_statusbar.xml | 7 +++++++
 4 files changed, 23 insertions(+)
 create mode 100644 res/drawable/ic_roaming.xml

diff --git a/res/drawable/ic_roaming.xml b/res/drawable/ic_roaming.xml
new file mode 100644
index 0000000..6a9998f
--- /dev/null
+++ b/res/drawable/ic_roaming.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m51.199,187.941h46.934c21.207,0 38.402,-17.191 38.402,-38.402 0,-21.207 -17.195,-38.398 -38.402,-38.398h-46.934c-4.711,0 -8.531,3.82 -8.531,8.535v59.73c0,4.715 3.82,8.535 8.531,8.535zM59.734,128.207h38.398c11.781,0 21.332,9.551 21.332,21.332 0,11.785 -9.551,21.336 -21.332,21.336h-38.398zM59.734,128.207"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m17.066,307.406h25.602c9.418,-0.008 17.055,-7.645 17.066,-17.066v-68.266h17.258l41.082,76.359c2.973,5.531 8.746,8.977 15.027,8.973h31.816c6.004,0 11.57,-3.156 14.648,-8.316 3.082,-5.156 3.223,-11.551 0.375,-16.84l-37.492,-69.648c5.656,-3.234 10.859,-7.199 15.477,-11.801 14.852,-14.852 22.547,-35.406 21.098,-56.359 -3.422,-38.574 -36.012,-67.977 -74.73,-67.434h-87.227c-9.422,0.012 -17.055,7.645 -17.066,17.066v196.266c0.012,9.422 7.645,17.059 17.066,17.066zM17.066,94.074h87.227c29.754,-0.563 54.914,21.91 57.699,51.543 1.117,16.031 -4.77,31.758 -16.133,43.117 -5.258,5.242 -11.496,9.395 -18.359,12.223 -2.238,0.914 -3.984,2.738 -4.801,5.016 -0.816,2.277 -0.629,4.797 0.52,6.926l41.738,77.441h-31.855l-43.492,-80.84c-1.488,-2.77 -4.375,-4.492 -7.52,-4.492h-30.891c-4.711,0 -8.531,3.82 -8.531,8.531v76.801h-25.602zM17.066,94.074"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m170.668,333.008c-9.422,0.012 -17.059,7.645 -17.066,17.066v76.801c0,4.711 3.82,8.531 8.531,8.531h59.734c4.711,0 8.531,-3.82 8.531,-8.531v-76.801c-0.008,-9.422 -7.645,-17.055 -17.066,-17.066zM170.668,418.34v-68.266h42.664v68.266zM170.668,418.34"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m264.535,247.676c-9.422,0.008 -17.059,7.645 -17.07,17.066v162.133c0,4.711 3.824,8.531 8.535,8.531h59.734c4.711,0 8.531,-3.82 8.531,-8.531v-162.133c-0.012,-9.422 -7.645,-17.059 -17.066,-17.066zM264.535,418.34v-153.598h42.664v153.598zM264.535,418.34"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m349.867,435.406h59.734c4.711,0 8.531,-3.82 8.531,-8.531v-247.469c-0.012,-9.422 -7.645,-17.055 -17.066,-17.066h-42.668c-9.418,0.012 -17.055,7.645 -17.066,17.066v247.469c0,4.711 3.82,8.531 8.535,8.531zM358.398,179.406h42.668v238.934h-42.668zM358.398,179.406"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m443.734,435.406h59.73c4.715,0 8.535,-3.82 8.535,-8.531v-332.801c-0.012,-9.422 -7.645,-17.055 -17.066,-17.066h-42.668c-9.422,0.012 -17.055,7.645 -17.066,17.066v332.801c0,4.711 3.82,8.531 8.535,8.531zM452.266,94.074h42.668v324.266h-42.668zM452.266,94.074"/>
+</vector>
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index 4172bba..1916ef9 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -766,4 +766,7 @@
    <string name="unsupported_gestures">Bật điều hướng hai nút hoặc ba nút để sử dụng tính năng này</string>
    <string name="navbar_visibility">Thanh điều hướng</string>
     <string name="navbar_vis_summary">Bật-tắt thanh điều hướng</string>
+    <!-- Roaming indicator icon -->
+    <string name="roaming_indicator_icon_title">Chỉ báo chuyển vùng</string>
+    <string name="roaming_indicator_icon_summary">Hiển thị chỉ báo chuyển vùng trong biểu tượng tín hiệu khi ở chế độ chuyển vùng</string>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 0f3472d..b0aba84 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -874,4 +874,8 @@
    
    <string name="navbar_visibility">Nav Bar</string>
     <string name="navbar_vis_summary">Enable-disable navigation bar</string>
+
+   <!-- Roaming indicator icon -->
+    <string name="roaming_indicator_icon_title">Roaming indicator</string>
+    <string name="roaming_indicator_icon_summary">Display roaming indicator in signal icon when in roaming mode</string>
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index eeb6fde..63cbc8d 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -54,6 +54,13 @@
          android:title="@string/data_disabled_icon_title" 
          android:summary="@string/data_disabled_icon_summary"
          android:defaultValue="true"/>
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="roaming_indicator_icon"
+            android:icon="@drawable/ic_roaming"
+            android:title="@string/roaming_indicator_icon_title"
+            android:summary="@string/roaming_indicator_icon_summary"
+            android:defaultValue="true"/>
 		
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="show_volte_icon"