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

Traffic: Change to if/else from switch for updateTrafficLocation()

Browse Source 
* Fixing Expanded header option jumping from Disabled state.
 * Also, update font size options

Signed-off-by: ShubhamB <shubhamprince111@gmail.com>
Change-Id: I9088a45e30a2cdd4f0835a5daaf23b471d34e738
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
sb6596
2021-10-25 08:39:16 +00:00
committed by Hưng Phan
parent 7b3758b51c
commit 8983c890d0
2 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
res/xml/traffic.xml
View File

@@ -16,40 +16,41 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<ListPreference <ListPreference
android:key="network_traffic_location" android:key="network_traffic_view_location"
android:title="@string/network_traffic_location" android:title="@string/network_traffic_location"
android:summary="%s" android:summary="%s"
android:entries="@array/network_traffic_location_entries" android:entries="@array/network_traffic_location_entries"
android:entryValues="@array/network_traffic_location_values" android:entryValues="@array/network_traffic_location_values"
android:persistent="false" /> android:persistent="false" />
<ListPreference <ListPreference
android:key="network_traffic_type" android:key="network_traffic_type"
android:title="@string/network_traffic_type" android:title="@string/network_traffic_type"
android:entries="@array/show_network_traffic_type_entries" android:entries="@array/show_network_traffic_type_entries"
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" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="network_traffic_autohide_threshold"
android:title="@string/network_traffic_autohide_threshold_title"
android:max="10"
settings:min="0"
settings:units="" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference <com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="network_traffic_arrow" android:key="network_traffic_arrow"
android:title="@string/network_traffic_arrow" android:title="@string/network_traffic_arrow"
android:summary="@string/network_traffic_arrow_summary" android:summary="@string/network_traffic_arrow_summary"
android:defaultValue="true" /> android:defaultValue="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference <com.cherish.settings.preferences.CustomSeekBarPreference
android:key="network_traffic_font_size" android:key="network_traffic_autohide_threshold"
android:title="@string/nettraf_font_size" android:title="@string/network_traffic_autohide_threshold_title"
android:max="60" android:max="10"
settings:min="21" settings:min="0"
settings:defaultValue="30" settings:defaultValue="1"
settings:units="dp" /> settings:units="" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="network_traffic_font_size"
android:title="@string/nettraf_font_size"
android:max="46"
android:min="26"
settings:defaultValue="36"
settings:units="dp" />
</PreferenceScreen> </PreferenceScreen>

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

@@ -51,6 +51,10 @@ import com.cherish.settings.preferences.SystemSettingSwitchPreference;
public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener { public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
private static final String NETWORK_TRAFFIC_TYPE = "network_traffic_type";
private static final String NETWORK_TRAFFIC_VIEW_LOCATION = "network_traffic_view_location";
private static final String NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD = "network_traffic_autohide_threshold";
private static final String NETWORK_TRAFFIC_ARROW = "network_traffic_arrow";
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 ListPreference mNetTrafficLocation; private ListPreference mNetTrafficLocation;
@@ -69,29 +73,29 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
final PreferenceScreen prefSet = getPreferenceScreen(); final PreferenceScreen prefSet = getPreferenceScreen();
int NetTrafficSize = Settings.System.getInt(resolver, int NetTrafficSize = Settings.System.getInt(resolver,
Settings.System.NETWORK_TRAFFIC_FONT_SIZE, 42); Settings.System.NETWORK_TRAFFIC_FONT_SIZE, 36);
mNetTrafficSize = (CustomSeekBarPreference) findPreference(NETWORK_TRAFFIC_FONT_SIZE); mNetTrafficSize = (CustomSeekBarPreference) findPreference(NETWORK_TRAFFIC_FONT_SIZE);
mNetTrafficSize.setValue(NetTrafficSize / 1); mNetTrafficSize.setValue(NetTrafficSize / 1);
mNetTrafficSize.setOnPreferenceChangeListener(this); mNetTrafficSize.setOnPreferenceChangeListener(this);
int type = Settings.System.getIntForUser(resolver, int type = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_TYPE, 0, UserHandle.USER_CURRENT); Settings.System.NETWORK_TRAFFIC_TYPE, 0, UserHandle.USER_CURRENT);
mNetTrafficType = (ListPreference) findPreference("network_traffic_type"); mNetTrafficType = (ListPreference) findPreference(NETWORK_TRAFFIC_TYPE);
mNetTrafficType.setValue(String.valueOf(type)); mNetTrafficType.setValue(String.valueOf(type));
mNetTrafficType.setSummary(mNetTrafficType.getEntry()); mNetTrafficType.setSummary(mNetTrafficType.getEntry());
mNetTrafficType.setOnPreferenceChangeListener(this); mNetTrafficType.setOnPreferenceChangeListener(this);
mNetTrafficLocation = (ListPreference) findPreference("network_traffic_location"); mNetTrafficLocation = (ListPreference) findPreference(NETWORK_TRAFFIC_VIEW_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);
mNetTrafficLocation.setOnPreferenceChangeListener(this); mNetTrafficLocation.setOnPreferenceChangeListener(this);
int trafvalue = Settings.System.getIntForUser(resolver, int trafvalue = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, 1, UserHandle.USER_CURRENT); Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, 1, UserHandle.USER_CURRENT);
mThreshold = (CustomSeekBarPreference) findPreference("network_traffic_autohide_threshold"); mThreshold = (CustomSeekBarPreference) findPreference(NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD);
mThreshold.setValue(trafvalue); mThreshold.setValue(trafvalue);
mThreshold.setOnPreferenceChangeListener(this); mThreshold.setOnPreferenceChangeListener(this);
mShowArrows = (SystemSettingSwitchPreference) findPreference("network_traffic_arrow"); mShowArrows = (SystemSettingSwitchPreference) findPreference(NETWORK_TRAFFIC_ARROW);
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);
@@ -110,11 +114,6 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
return MetricsEvent.CHERISH_SETTINGS; return MetricsEvent.CHERISH_SETTINGS;
} }
@Override
public void onResume() {
super.onResume();
}
@Override @Override
public boolean onPreferenceChange(Preference preference, Object objValue) { public boolean onPreferenceChange(Preference preference, Object objValue) {
if (preference == mNetTrafficLocation) { if (preference == mNetTrafficLocation) {
@@ -159,22 +158,16 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
} }
public void updateTrafficLocation(int location) { public void updateTrafficLocation(int location) {
switch(location){ if (location == 0) {
case 0: mThreshold.setEnabled(false);
mThreshold.setEnabled(false); mShowArrows.setEnabled(false);
mShowArrows.setEnabled(false); mNetTrafficType.setEnabled(false);
mNetTrafficType.setEnabled(false); mNetTrafficSize.setEnabled(false);
mNetTrafficSize.setEnabled(false); } else {
break; mThreshold.setEnabled(true);
case 1: mShowArrows.setEnabled(true);
case 2: mNetTrafficType.setEnabled(true);
mThreshold.setEnabled(true); mNetTrafficSize.setEnabled(true);
mShowArrows.setEnabled(true);
mNetTrafficType.setEnabled(true);
mNetTrafficSize.setEnabled(true);
break;
default:
break;
} }
} }
} }