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

NetworkTraffic: Cleanup and align to the new implementation.

Browse Source 
* Also port "Show single traffic and allow custom font size [2/2]"
* Thanks to neobuddy for showing how the code can be slimmed down:
  https://github.com/crdroidandroid/android_packages_apps_crDroidSettings/commit/cab6d64

Signed-off-by: spezi77 <spezi7713@gmx.net>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
spezi77
2022-02-28 19:12:58 +01:00
committed by Hưng Phan
parent 8118c376c5
commit 4c5cdef705
5 changed files with 173 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/values/cherish_arrays.xml
View File

@@ -408,7 +408,7 @@
<item>3</item>
</string-array>
<!-- Network traffic location -->
<!-- Network Traffic -->
<string-array name="network_traffic_location_entries" translatable="false">
<item>@string/network_traffic_disabled</item>
<item>@string/network_traffic_statusbar</item>
@@ -420,11 +420,11 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="network_traffic_mode_entries" translatable="false">
<string-array name="network_traffic_mode_entries" translatable="false">
<item>@string/network_traffic_dynamic</item>
<item>@string/network_traffic_download</item>
<item>@string/network_traffic_upload</item>
<item>@string/network_traffic_download</item>
</string-array>
<string-array name="network_traffic_mode_values" translatable="false">
@@ -432,4 +432,16 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="network_traffic_units_entries" translatable="false">
<item>@string/network_traffic_units_bits</item>
<item>@string/network_traffic_units_bytes</item>
</string-array>
<string-array name="network_traffic_units_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
</resources>

14
res/values/cherish_strings.xml
View File

@@ -508,10 +508,24 @@
<string name="network_traffic_statusbar">Status bar</string>
<string name="network_traffic_qs_header">QS header</string>
<string name="network_traffic_refresh_interval_title">Refresh interval</string>
<string name="network_traffic_refresh_interval_summary">Duration after which speed is remeasured</string>
<string name="network_traffic_mode_title">Display mode</string>
<string name="network_traffic_dynamic">Dynamic</string>
<string name="network_traffic_download">Download</string>
<string name="network_traffic_upload">Upload</string>
<string name="network_traffic_font_size">Single net font size</string>
<string name="network_traffic_autohide">Auto hide</string>
<string name="network_traffic_autohide_summary">Hide the traffic monitor when inactive</string>
<string name="network_traffic_autohide_kilobits">Kb/s</string>
<string name="network_traffic_autohide_kilobytes">KB/s</string>
<string name="network_traffic_units_title">Traffic measurement units</string>
<string name="network_traffic_units_bits">Bits per second (b/s)</string>
<string name="network_traffic_units_kilobits">Kilobits per second (kb/s)</string>
<string name="network_traffic_units_megabits">Megabits per second (Mb/s)</string>
<string name="network_traffic_units_bytes">Bytes per second (B/s)</string>
<string name="network_traffic_units_kilobytes">Kilobytes per second (kB/s)</string>
<string name="network_traffic_units_megabytes">Megabytes per second (MB/s)</string>
<string name="network_traffic_hidearrow">Hide arrows</string>
<string name="network_traffic_hidearrow_summary">Hide the network traffic indicator arrows</string>
</resources>

63
res/xml/cherish_settings_traffic.xml
View File

@@ -1,62 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020-2022 The CherishOS Project
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2020-2022 The CherishOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/traffic_title">
<ListPreference
<PreferenceScreen
android:title="@string/traffic_title"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="network_traffic_location"
android:title="@string/network_traffic_location_title"
android:summary="%s"
android:entries="@array/network_traffic_location_entries"
android:entryValues="@array/network_traffic_location_values"
android:defaultValue="0"
android:persistent="false" />
android:defaultValue="0" />
<com.cherish.settings.preferences.CustomSeekBarPreference
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="network_traffic_autohide"
android:title="@string/network_traffic_autohide"
android:summary="@string/network_traffic_autohide_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="network_traffic_autohide_threshold"
android:title="@string/network_traffic_autohide_threshold_title"
android:max="10"
android:defaultValue="0"
android:max="10000"
settings:min="0"
settings:units="KB/s"
android:defaultValue="0" />
settings:units="@string/network_traffic_autohide_kilobytes"
settings:interval="10"
android:dependency="network_traffic_autohide" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="network_traffic_mode"
android:title="@string/network_traffic_mode_title"
android:entries="@array/network_traffic_mode_entries"
android:entryValues="@array/network_traffic_mode_values"
android:summary="%s"
android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="network_traffic_refresh_interval"
android:title="@string/network_traffic_refresh_interval_title"
android:summary="@string/network_traffic_refresh_interval_summary"
android:defaultValue="2"
android:max="10"
settings:min="1"
settings:units="sec"
settings:units="@string/unit_seconds" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="network_traffic_units"
android:title="@string/network_traffic_units_title"
android:entries="@array/network_traffic_units_entries"
android:entryValues="@array/network_traffic_units_values"
android:summary="%s"
android:defaultValue="1" />
<com.cherish.settings.preferences.CustomSeekBarPreference
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="network_traffic_hidearrow"
android:title="@string/network_traffic_hidearrow"
android:summary="@string/network_traffic_hidearrow_summary" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="network_traffic_font_size"
android:title="@string/network_traffic_font_size"
android:max="20"
android:min="12"
android:max="24"
settings:min="14"
settings:defaultValue="18"
settings:units="dp" />
</PreferenceScreen>
</PreferenceScreen>