From 78810eb50325034bdbb0442516be5f654bef04e6 Mon Sep 17 00:00:00 2001
From: Jon Haus <haus.xda@gmail.com>
Date: Fri, 16 Nov 2018 01:36:25 +0530
Subject: [PATCH] Cherish:Add network traffic type [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib14267df32525439ea67f9b7874a15965a4c5a7c
Signed-off-by: Josh Fox (XlxFoXxlX) <joshfox87@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                  | 13 +++++++++++++
 res/values/cherish_strings.xml                 |  4 ++++
 res/xml/traffic.xml                            | 10 +++++++++-
 .../cherish/settings/fragments/Traffic.java    | 18 ++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 2f2103c..83e811d 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -250,4 +250,17 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+	
+	<!-- 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_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>2</item>
+        <item>0</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index f1b5fa5..ff2fdc1 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -356,4 +356,8 @@
     <string name="network_traffic_autohide_threshold_title">Net activity autohide threshold (KB/s)</string>
     <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>
 </resources>
diff --git a/res/xml/traffic.xml b/res/xml/traffic.xml
index 50e9a11..a018dd1 100644
--- a/res/xml/traffic.xml
+++ b/res/xml/traffic.xml
@@ -12,7 +12,7 @@
 -->
 
 <PreferenceScreen
-    android:title="@string/network_traffic"
+    android:title="@string/network_traffic_state_title"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
@@ -23,6 +23,14 @@
         android:entries="@array/network_traffic_location_entries"
         android:entryValues="@array/network_traffic_location_values"
         android:persistent="false" />
+		
+	<ListPreference
+        android:key="network_traffic_type"
+        android:title="@string/network_traffic_type"
+        android:entries="@array/show_network_traffic_type_entries"
+        android:entryValues="@array/show_network_traffic_type_values"
+        android:defaultValue="0"
+        android:persistent="false" />
 
     <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="network_traffic_autohide_threshold"
diff --git a/src/com/cherish/settings/fragments/Traffic.java b/src/com/cherish/settings/fragments/Traffic.java
index 7e0dc86..e8dae75 100644
--- a/src/com/cherish/settings/fragments/Traffic.java
+++ b/src/com/cherish/settings/fragments/Traffic.java
@@ -52,6 +52,7 @@ import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
 
     private ListPreference mNetTrafficLocation;
+    private ListPreference mNetTrafficType;
     private CustomSeekBarPreference mThreshold;
     private SystemSettingSwitchPreference mShowArrows;
 
@@ -64,6 +65,13 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
         final ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefSet = getPreferenceScreen();
 
+        int type = Settings.System.getIntForUser(resolver,
+                Settings.System.NETWORK_TRAFFIC_TYPE, 0, UserHandle.USER_CURRENT);
+        mNetTrafficType = (ListPreference) findPreference("network_traffic_type");
+        mNetTrafficType.setValue(String.valueOf(type));
+        mNetTrafficType.setSummary(mNetTrafficType.getEntry());
+        mNetTrafficType.setOnPreferenceChangeListener(this);
+
         mNetTrafficLocation = (ListPreference) findPreference("network_traffic_location");
         int location = Settings.System.getIntForUser(resolver,
                 Settings.System.NETWORK_TRAFFIC_VIEW_LOCATION, 0, UserHandle.USER_CURRENT);
@@ -124,6 +132,14 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
                     Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, val,
                     UserHandle.USER_CURRENT);
             return true;
+        } else if (preference == mNetTrafficType) {
+            int val = Integer.valueOf((String) objValue);
+            Settings.System.putIntForUser(getContentResolver(),
+                    Settings.System.NETWORK_TRAFFIC_TYPE, val,
+                    UserHandle.USER_CURRENT);
+            int index = mNetTrafficType.findIndexOfValue((String) objValue);
+            mNetTrafficType.setSummary(mNetTrafficType.getEntries()[index]);
+            return true;
         }
         return false;
     }
@@ -133,11 +149,13 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
             case 0:
                 mThreshold.setEnabled(false);
                 mShowArrows.setEnabled(false);
+                mNetTrafficType.setEnabled(false);
                 break;
             case 1:
             case 2:
                 mThreshold.setEnabled(true);
                 mShowArrows.setEnabled(true);
+                mNetTrafficType.setEnabled(true);
                 break;
             default:
                 break;