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

Cherish:Use Selectable Network Traffic Fonts [2/2]

Browse Source 
Change-Id: I985ee893eb4a7c28efd7ab3cf564f211f380838d
Signed-off-by: Sonal Singh <sonal.singh.19993@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Advaith Bhat
2020-08-04 18:21:05 +02:00
committed by Hưng Phan
parent 9bf88b9d95
commit ba949ac0f9
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/cherish_strings.xml
View File

@@ -366,5 +366,6 @@
<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">Activity layout</string>
<string name="network_traffic_layout_h">Horizontal</string> <string name="network_traffic_layout_h">Horizontal</string>
<string name="network_traffic_layout_v">Verticle</string> <string name="network_traffic_layout_v">Vertical</string>
<string name="net_traffic_font">Fonts</string>
</resources> </resources>

9
res/xml/traffic.xml
View File

@@ -59,4 +59,13 @@
settings:min="21" settings:min="21"
settings:defaultValue="42" settings:defaultValue="42"
settings:units="dp" /> settings:units="dp" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="network_traffic_font_style"
android:title="@string/net_traffic_font"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="0" />
</PreferenceScreen> </PreferenceScreen>

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

@@ -48,10 +48,12 @@ import com.android.settings.Utils;
import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.CustomSeekBarPreference;
import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.cherish.settings.preferences.SystemSettingSwitchPreference;
import com.cherish.settings.preferences.SystemSettingListPreference;
public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener { public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
private static final String NETWORK_TRAFFIC_FONT_SIZE = "network_traffic_font_size"; private static final String NETWORK_TRAFFIC_FONT_SIZE = "network_traffic_font_size";
private static final String NETWORK_TRAFFIC_FONT_STYLE = "network_traffic_font_style";
private ListPreference mNetTrafficLocation; private ListPreference mNetTrafficLocation;
private ListPreference mNetTrafficType; private ListPreference mNetTrafficType;
@@ -59,6 +61,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
private CustomSeekBarPreference mNetTrafficSize; private CustomSeekBarPreference mNetTrafficSize;
private CustomSeekBarPreference mThreshold; private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mShowArrows; private SystemSettingSwitchPreference mShowArrows;
private SystemSettingListPreference mNetTrafficFont;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -101,6 +104,12 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
mThreshold.setOnPreferenceChangeListener(this); mThreshold.setOnPreferenceChangeListener(this);
mShowArrows = (SystemSettingSwitchPreference) findPreference("network_traffic_arrow"); mShowArrows = (SystemSettingSwitchPreference) findPreference("network_traffic_arrow");
mNetTrafficFont = (SystemSettingListPreference) findPreference(NETWORK_TRAFFIC_FONT_STYLE); int
netTrafFont = Settings.System.getInt(resolver,
Settings.System.NETWORK_TRAFFIC_FONT_STYLE, 0);
mNetTrafficFont.setValue(String.valueOf(netTrafFont));
mNetTrafficFont.setOnPreferenceChangeListener(this);
int netMonitorEnabled = Settings.System.getIntForUser(resolver, int netMonitorEnabled = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT); Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT);
if (netMonitorEnabled == 1) { if (netMonitorEnabled == 1) {
@@ -170,6 +179,13 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
Settings.System.putInt(getActivity().getContentResolver(), Settings.System.putInt(getActivity().getContentResolver(),
Settings.System.NETWORK_TRAFFIC_FONT_SIZE, width); Settings.System.NETWORK_TRAFFIC_FONT_SIZE, width);
return true; return true;
} else if (preference == mNetTrafficFont) {
int netTrafFont = Integer.valueOf((String) objValue);
int index = mNetTrafficFont.findIndexOfValue((String) objValue);
Settings.System.putInt(getActivity().getContentResolver(), Settings.System.
NETWORK_TRAFFIC_FONT_STYLE, netTrafFont);
mNetTrafficFont.setSummary(mNetTrafficFont.getEntries()[index]);
return true;
} }
return false; return false;
} }