diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 430724e..776e199 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -366,5 +366,6 @@ Single net font size Activity layout Horizontal - Verticle + Vertical + Fonts diff --git a/res/xml/traffic.xml b/res/xml/traffic.xml index b99c267..b7c1f2c 100644 --- a/res/xml/traffic.xml +++ b/res/xml/traffic.xml @@ -59,4 +59,13 @@ settings:min="21" settings:defaultValue="42" settings:units="dp" /> + + + diff --git a/src/com/cherish/settings/fragments/Traffic.java b/src/com/cherish/settings/fragments/Traffic.java index 9dd5642..e7a322b 100644 --- a/src/com/cherish/settings/fragments/Traffic.java +++ b/src/com/cherish/settings/fragments/Traffic.java @@ -48,10 +48,12 @@ import com.android.settings.Utils; import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.SystemSettingSwitchPreference; +import com.cherish.settings.preferences.SystemSettingListPreference; 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_STYLE = "network_traffic_font_style"; private ListPreference mNetTrafficLocation; private ListPreference mNetTrafficType; @@ -59,6 +61,7 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC private CustomSeekBarPreference mNetTrafficSize; private CustomSeekBarPreference mThreshold; private SystemSettingSwitchPreference mShowArrows; + private SystemSettingListPreference mNetTrafficFont; @Override public void onCreate(Bundle savedInstanceState) { @@ -101,6 +104,12 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC mThreshold.setOnPreferenceChangeListener(this); 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, Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT); if (netMonitorEnabled == 1) { @@ -170,6 +179,13 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC Settings.System.putInt(getActivity().getContentResolver(), Settings.System.NETWORK_TRAFFIC_FONT_SIZE, width); 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; }