psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherish:Add Network Traffic Layout [2/2]

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
AnkitGourav
2020-05-04 04:43:38 +00:00
committed by Hưng Phan
parent 20cf85ddea
commit 9bf88b9d95
4 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/cherish_arrays.xml
View File

@@ -267,4 +267,15 @@
<item>2</item> <item>2</item>
<item>0</item> <item>0</item>
</string-array> </string-array>
<!-- Network Traffic Layout -->
<string-array name="network_traffic_layout_entries" translatable="false">
<item>@string/network_traffic_layout_h</item>
<item>@string/network_traffic_layout_v</item>
</string-array>
<string-array name="network_traffic_layout_values" translatable="false">
<item>0</item>
<item>1</item>
</string-array>
</resources> </resources>

3
res/values/cherish_strings.xml
View File

@@ -364,4 +364,7 @@
<string name="show_network_traffic_down">Download</string> <string name="show_network_traffic_down">Download</string>
<string name="show_network_traffic_all">Both</string> <string name="show_network_traffic_all">Both</string>
<string name="nettraf_font_size">Single net font size</string> <string name="nettraf_font_size">Single net font size</string>
<string name="network_traffic_layout">Activity layout</string>
<string name="network_traffic_layout_h">Horizontal</string>
<string name="network_traffic_layout_v">Verticle</string>
</resources> </resources>

7
res/xml/traffic.xml
View File

@@ -31,6 +31,13 @@
android:entryValues="@array/show_network_traffic_type_values" android:entryValues="@array/show_network_traffic_type_values"
android:defaultValue="0" android:defaultValue="0"
android:persistent="false" /> android:persistent="false" />
<ListPreference
android:key="network_traffic_layout"
android:title="@string/network_traffic_layout"
android:entries="@array/network_traffic_layout_entries"
android:entryValues="@array/network_traffic_layout_values"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference <com.cherish.settings.preferences.CustomSeekBarPreference
android:key="network_traffic_autohide_threshold" android:key="network_traffic_autohide_threshold"

18
src/com/cherish/settings/fragments/Traffic.java
View File

@@ -55,6 +55,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
private ListPreference mNetTrafficLocation; private ListPreference mNetTrafficLocation;
private ListPreference mNetTrafficType; private ListPreference mNetTrafficType;
private ListPreference mNetTrafficLayout;
private CustomSeekBarPreference mNetTrafficSize; private CustomSeekBarPreference mNetTrafficSize;
private CustomSeekBarPreference mThreshold; private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mShowArrows; private SystemSettingSwitchPreference mShowArrows;
@@ -81,6 +82,13 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
mNetTrafficType.setSummary(mNetTrafficType.getEntry()); mNetTrafficType.setSummary(mNetTrafficType.getEntry());
mNetTrafficType.setOnPreferenceChangeListener(this); mNetTrafficType.setOnPreferenceChangeListener(this);
int netlayout = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_LAYOUT, 0, UserHandle.USER_CURRENT);
mNetTrafficLayout = (ListPreference) findPreference("network_traffic_layout");
mNetTrafficLayout.setValue(String.valueOf(netlayout));
mNetTrafficLayout.setSummary(mNetTrafficLayout.getEntry());
mNetTrafficLayout.setOnPreferenceChangeListener(this);
mNetTrafficLocation = (ListPreference) findPreference("network_traffic_location"); mNetTrafficLocation = (ListPreference) findPreference("network_traffic_location");
int location = Settings.System.getIntForUser(resolver, int location = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_VIEW_LOCATION, 0, UserHandle.USER_CURRENT); Settings.System.NETWORK_TRAFFIC_VIEW_LOCATION, 0, UserHandle.USER_CURRENT);
@@ -135,6 +143,14 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
updateTrafficLocation(location); updateTrafficLocation(location);
} }
return true; return true;
} else if (preference == mNetTrafficLayout) {
int val = Integer.valueOf((String) objValue);
Settings.System.putIntForUser(getContentResolver(),
Settings.System.NETWORK_TRAFFIC_LAYOUT, val,
UserHandle.USER_CURRENT);
int index = mNetTrafficLayout.findIndexOfValue((String) objValue);
mNetTrafficLayout.setSummary(mNetTrafficLayout.getEntries()[index]);
return true;
} else if (preference == mThreshold) { } else if (preference == mThreshold) {
int val = (Integer) objValue; int val = (Integer) objValue;
Settings.System.putIntForUser(getContentResolver(), Settings.System.putIntForUser(getContentResolver(),
@@ -165,6 +181,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
mShowArrows.setEnabled(false); mShowArrows.setEnabled(false);
mNetTrafficType.setEnabled(false); mNetTrafficType.setEnabled(false);
mNetTrafficSize.setEnabled(false); mNetTrafficSize.setEnabled(false);
mNetTrafficLayout.setEnabled(false);
break; break;
case 1: case 1:
case 2: case 2:
@@ -172,6 +189,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
mShowArrows.setEnabled(true); mShowArrows.setEnabled(true);
mNetTrafficType.setEnabled(true); mNetTrafficType.setEnabled(true);
mNetTrafficSize.setEnabled(true); mNetTrafficSize.setEnabled(true);
mNetTrafficLayout.setEnabled(true);
break; break;
default: default:
break; break;