From c8fff8b562b721402478dbd6a9f309bd917097f8 Mon Sep 17 00:00:00 2001 From: spezi77 Date: Fri, 29 Nov 2019 14:26:47 +0100 Subject: [PATCH] NetworkTraffic positioning: Adapt to new settings flags. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partially based on: https://github.com/calebcabob/CoralReef/commit/1146bf83de9d72eb2d153bd87bbe0898225381a3 spezi77 edits: -Clean up the code -Refactorized to work with our new commit: https://github.com/PixelDust-Project-X/android_frameworks_base/commit/c11cb77923fd09b866bb3d54a3a6a708034c09af Change-Id: I5fc55ed94a1c9fabacde19e128baaa172a4b4a4c Signed-off-by: spezi77 Signed-off-by: Arghya Chanda Signed-off-by: SagarMakhar Signed-off-by: Hưng Phan --- res/values/cherish_strings.xml | 7 +-- res/xml/traffic.xml | 2 +- .../cherish/settings/fragments/Traffic.java | 50 ++++++++++--------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 43bb473..3bdf4eb 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -269,11 +269,12 @@ Traffic Indicators - Network traffic - Show net activity + Network traffic + Network traffic display + Traffic indicator placement Disabled Statusbar - Expanded Statusbar + Expanded header Net activity autohide threshold (KB/s) Show arrows Show the network traffic indicator arrows diff --git a/res/xml/traffic.xml b/res/xml/traffic.xml index 94d9a17..abee92c 100644 --- a/res/xml/traffic.xml +++ b/res/xml/traffic.xml @@ -12,7 +12,7 @@ --> diff --git a/src/com/cherish/settings/fragments/Traffic.java b/src/com/cherish/settings/fragments/Traffic.java index 2d2f778..459992f 100644 --- a/src/com/cherish/settings/fragments/Traffic.java +++ b/src/com/cherish/settings/fragments/Traffic.java @@ -66,9 +66,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC mNetTrafficLocation = (ListPreference) findPreference("network_traffic_location"); int location = Settings.System.getIntForUser(resolver, - Settings.System.NETWORK_TRAFFIC_LOCATION, 0, UserHandle.USER_CURRENT); - mNetTrafficLocation.setValue(String.valueOf(location)); - mNetTrafficLocation.setSummary(mNetTrafficLocation.getEntry()); + Settings.System.NETWORK_TRAFFIC_VIEW_LOCATION, 0, UserHandle.USER_CURRENT); mNetTrafficLocation.setOnPreferenceChangeListener(this); int trafvalue = Settings.System.getIntForUser(resolver, @@ -78,7 +76,16 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC mThreshold.setOnPreferenceChangeListener(this); mShowArrows = (SystemSettingSwitchPreference) findPreference("network_traffic_arrow"); - updateTrafficLocation(location); + int netMonitorEnabled = Settings.System.getIntForUser(resolver, + Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT); + if (netMonitorEnabled == 1) { + mNetTrafficLocation.setValue(String.valueOf(location+1)); + updateTrafficLocation(location+1); + } else { + mNetTrafficLocation.setValue("0"); + updateTrafficLocation(0); + } + mNetTrafficLocation.setSummary(mNetTrafficLocation.getEntry()); } @Override @@ -96,10 +103,20 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC if (preference == mNetTrafficLocation) { int location = Integer.valueOf((String) objValue); int index = mNetTrafficLocation.findIndexOfValue((String) objValue); - Settings.System.putIntForUser(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_LOCATION, location, UserHandle.USER_CURRENT); mNetTrafficLocation.setSummary(mNetTrafficLocation.getEntries()[index]); - updateTrafficLocation(location); + if (location > 0) { + // Convert the selected location mode from our list {0,1,2} and store it to "view location" setting: 0=sb; 1=expanded sb + Settings.System.putIntForUser(getActivity().getContentResolver(), + Settings.System.NETWORK_TRAFFIC_VIEW_LOCATION, location-1, UserHandle.USER_CURRENT); + // And also enable the net monitor + Settings.System.putIntForUser(getActivity().getContentResolver(), + Settings.System.NETWORK_TRAFFIC_STATE, 1, UserHandle.USER_CURRENT); + updateTrafficLocation(location+1); + } else { // Disable net monitor completely + Settings.System.putIntForUser(getActivity().getContentResolver(), + Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT); + updateTrafficLocation(location); + } return true; } else if (preference == mThreshold) { int val = (Integer) objValue; @@ -112,32 +129,17 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC } public void updateTrafficLocation(int location) { - switch(location){ + switch(location){ case 0: mThreshold.setEnabled(false); mShowArrows.setEnabled(false); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_STATE, 0); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_EXPANDED_STATUS_BAR_STATE, 0); break; case 1: - mThreshold.setEnabled(true); - mShowArrows.setEnabled(true); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_STATE, 1); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_EXPANDED_STATUS_BAR_STATE, 0); - break; case 2: mThreshold.setEnabled(true); mShowArrows.setEnabled(true); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_STATE, 0); - Settings.System.putInt(getActivity().getContentResolver(), - Settings.System.NETWORK_TRAFFIC_EXPANDED_STATUS_BAR_STATE, 1); break; - default: + default: break; } }