From a8ae48326470c2ef9b8f3b35a0ce69821985aa9f Mon Sep 17 00:00:00 2001
From: AnkitGourav <Ankitgourav035@gmail.com>
Date: Mon, 18 Nov 2019 16:01:38 +0530
Subject: [PATCH] NetworkTraffic: Add Combined & Dynamic Mode [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spezi77 edits:
-Squashed into one commit
-Updated strings

Change-Id: I291c802c0d4b252e5205aec58bb0db465eb2ca3c
Signed-off-by: spezi77 <spezi7713@gmx.net>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml  | 8 ++++++--
 res/values/cherish_strings.xml | 8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 83e811d..6e8c00b 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -253,13 +253,17 @@
 	
 	<!-- Network traffic type -->
     <string-array name="show_network_traffic_type_entries" translatable="false">
-        <item>@string/show_network_traffic_up</item>
+        <item>@string/show_network_traffic_combined</item>
+        <item>@string/show_network_traffic_dynamic</item>    
+		 <item>@string/show_network_traffic_up</item>
         <item>@string/show_network_traffic_down</item>
         <item>@string/show_network_traffic_all</item>
     </string-array>
 
     <string-array name="show_network_traffic_type_values" translatable="false">
-        <item>1</item>
+        <item>3</item>
+        <item>4</item>	
+	     <item>1</item>
         <item>2</item>
         <item>0</item>
     </string-array>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index c18b502..7b1e0f6 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -357,8 +357,10 @@
     <string name="network_traffic_arrow">Show arrows</string>
     <string name="network_traffic_arrow_summary">Show the network traffic indicator arrows</string>
     <string name="network_traffic_type">Select net activity type</string>
-    <string name="show_network_traffic_up">Uplink</string>
-    <string name="show_network_traffic_down">Downlink</string>
-    <string name="show_network_traffic_all">Uplink and Downlink</string>
+    <string name="show_network_traffic_combined">Combined (Upload + Download)</string>
+    <string name="show_network_traffic_dynamic">Dynamic</string>
+    <string name="show_network_traffic_up">Upload</string>
+    <string name="show_network_traffic_down">Download</string>
+    <string name="show_network_traffic_all">Both</string>
     <string name="nettraf_font_size">Single net font size</string>
 </resources>