diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-07-21 15:38:06 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2014-07-22 16:24:37 -0700 |
commit | b654846300f79e9e4c605ce62d09f9a05d232fee (patch) | |
tree | 7680adbda0d42bc2ad3ade1a5b03b5e925de344b /src/com/android/settings/net | |
parent | 47d27bd629838ded2d217f238b6e3b21d18485da (diff) | |
download | packages_apps_Settings-b654846300f79e9e4c605ce62d09f9a05d232fee.zip packages_apps_Settings-b654846300f79e9e4c605ce62d09f9a05d232fee.tar.gz packages_apps_Settings-b654846300f79e9e4c605ce62d09f9a05d232fee.tar.bz2 |
Data Usage, materialized!
Asset drop so Data Usage matches new Material spec. Removes time
dimension sweeps, so we now summarize the entire visible axis. Fix
time axis labels to not draw outside clip bounds. Remove pie chart.
No more checkboxes in menus. Telephony items like roaming are moved
back to cellular settings. Start wiring up multi-SIM support.
Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
Diffstat (limited to 'src/com/android/settings/net')
-rw-r--r-- | src/com/android/settings/net/DataUsageMeteredSettings.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java index 87358f6..d567c7e 100644 --- a/src/com/android/settings/net/DataUsageMeteredSettings.java +++ b/src/com/android/settings/net/DataUsageMeteredSettings.java @@ -29,10 +29,9 @@ import android.net.NetworkTemplate; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceCategory; -import android.provider.SearchIndexableResource; +import android.preference.SwitchPreference; import android.telephony.TelephonyManager; import com.android.settings.R; @@ -42,7 +41,6 @@ import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -117,7 +115,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme return pref; } - private class MeteredPreference extends CheckBoxPreference { + private class MeteredPreference extends SwitchPreference { private final NetworkTemplate mTemplate; private boolean mBinding; |