diff options
| -rwxr-xr-x | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/menu/data_usage.xml | 6 | ||||
| -rw-r--r-- | res/values/cm_arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 17 | ||||
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 375 | ||||
| -rw-r--r-- | src/com/android/settings/DataUsageUtils.java | 121 |
6 files changed, 498 insertions, 31 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 239abbb..fde2300 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2335,6 +2335,10 @@ <activity android:name="Settings$DataUsageSummaryActivity" android:label="@string/data_usage_summary_title" android:taskAffinity=""> + <intent-filter android:priority="1"> + <action android:name="cyanogenmod.settings.ACTION_DATA_USAGE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml index 749eb16..9994ca2 100644 --- a/res/menu/data_usage.xml +++ b/res/menu/data_usage.xml @@ -36,4 +36,10 @@ <item android:id="@+id/data_usage_menu_help" android:title="@string/help_label" /> + <item + android:id="@+id/data_usage_menu_data_alerts" + android:title="@string/data_usage_menu_enable_data_alerts" /> + <item + android:id="@+id/data_usage_menu_reset_stats" + android:title="@string/data_usage_menu_reset_stats" /> </menu> diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 21bcedc..830f74d 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -591,4 +591,10 @@ <item>600000</item> </string-array> + <string-array name="background_data_access_choices"> + <item>Over mobile data & WiFi</item> + <item>Only over WiFi</item> + <item>No access</item> + </string-array> + </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 78c0576..80a86bb 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -1169,4 +1169,21 @@ <string name="weather_settings_no_services_prompt">No weather provider services installed</string> <string name="weather_settings_button">Provider settings</string> + <string name="background_data_access">Background data access</string> + <string name="allow_background_both">Over mobile data & WiFi</string> + <string name="allow_background_wlan">Only over WiFi</string> + <string name="allow_background_none">No access</string> + <string name="mobile_data_alert">Mobile Data Alert</string> + <string name="mobile_data_alert_summary">Notify when the app uses a significant amount of data</string> + <string name="data_usage_menu_enable_data_alerts">Enable data usage alerts</string> + <string name="data_usage_menu_disable_data_alerts">Disable data usage alerts</string> + <string name="data_usage_menu_reset_stats">Reset data statistics</string> + <string name="reset_data_stats_msg">Confirming this will clear all past and present data tracking information.</string> + <string name="reset_stats_confirm">Confirm</string> + + <string name="restrict_cellular_access_title">Restrict cellular data access</string> + <string name="restrict_cellular_access_summary">Disable data access on cellular networks</string> + <string name="restrict_cellular_access_dialog_title">Restrict cellular data access?</string> + <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only cellular networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string> + </resources> diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 63120e3..22a9994 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -25,6 +25,8 @@ import static android.net.NetworkPolicy.WARNING_DISABLED; import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE; import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; +import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN_BACKGROUND; +import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA; import static android.net.NetworkPolicyManager.computeLastCycleBoundary; import static android.net.NetworkPolicyManager.computeNextCycleBoundary; import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER; @@ -127,6 +129,7 @@ import android.widget.Toast; import com.android.internal.logging.MetricsLogger; import com.android.internal.telephony.PhoneConstants; +import com.android.settings.DataUsageUtils; import com.android.settings.drawable.InsetBoundsDrawable; import com.android.settings.net.DataUsageMeteredSettings; import com.android.settings.search.BaseSearchIndexProvider; @@ -176,6 +179,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private static final String TAB_ETHERNET = "ethernet"; private static final String TAG_CONFIRM_DATA_DISABLE = "confirmDataDisable"; + private static final String TAG_CONFIRM_DATA_RESET = "confirmDataReset"; + private static final String TAG_CONFIRM_APP_RESTRICT_CELLULAR = "confirmAppRestrictCellular"; private static final String TAG_CONFIRM_LIMIT = "confirmLimit"; private static final String TAG_CYCLE_EDITOR = "cycleEditor"; private static final String TAG_WARNING_EDITOR = "warningEditor"; @@ -194,6 +199,9 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private static final int LOADER_CHART_DATA = 2; private static final int LOADER_SUMMARY = 3; + private static final int DATA_USAGE_BACKGROUND_FULL_ACCESS = 0; + private static final int DATA_USAGE_BACKGROUND_WLAN_ACCESS = 1; + private static final int DATA_USAGE_BACKGROUND_NO_ACCESS = 2; private INetworkManagementService mNetworkService; private INetworkStatsService mStatsService; @@ -206,6 +214,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private static final String PREF_FILE = "data_usage"; private static final String PREF_SHOW_WIFI = "show_wifi"; private static final String PREF_SHOW_ETHERNET = "show_ethernet"; + private static final String PREF_ENABLE_DATA_USAGE_NOTIFY = "enable_data_usage_notify"; private SharedPreferences mPrefs; @@ -250,11 +259,17 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private Button mAppSettings; private LinearLayout mAppSwitches; - private Switch mAppRestrict; + private Switch mAppDataAlert; + private Switch mAppCellularAccess; private View mAppRestrictView; + private View mAppDataAlertView; + private View mAppCellularAccessView; + private Spinner mRestrictSpinner; private boolean mShowWifi = false; private boolean mShowEthernet = false; + private boolean mShowAlerts = false; + private boolean mDataAlertsSupported = false; private NetworkTemplate mTemplate; private ChartData mChartData; @@ -273,6 +288,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private MenuItem mMenuShowEthernet; private MenuItem mMenuSimCards; private MenuItem mMenuCellularNetworks; + private MenuItem mMenuDataAlerts; + private MenuItem mMenuResetStats; private List<SubscriptionInfo> mSubInfoList; private Map<Integer,String> mMobileTagMap; @@ -334,6 +351,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, true); mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false); + mShowAlerts = mPrefs.getBoolean(PREF_ENABLE_DATA_USAGE_NOTIFY, false); // override preferences when no mobile radio if (!hasReadyMobileRadio(context)) { @@ -444,14 +462,51 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings); - mAppRestrict = new Switch(inflater.getContext()); - mAppRestrict.setClickable(false); - mAppRestrict.setFocusable(false); - mAppRestrictView = inflatePreference(inflater, mAppSwitches, mAppRestrict); + ArrayAdapter<String> restrictAdapter = new ArrayAdapter<String>( + inflater.getContext(), android.R.layout.simple_spinner_dropdown_item, + getResources().getStringArray(R.array.background_data_access_choices)); + + mRestrictSpinner = new Spinner(inflater.getContext()); + mRestrictSpinner.setAdapter(restrictAdapter); + mRestrictSpinner.setOnItemSelectedListener(mAppRestrictListener); + + mAppRestrictView = inflatePreferenceWithInvisibleWidget(inflater, + mAppSwitches, mRestrictSpinner); mAppRestrictView.setClickable(true); mAppRestrictView.setFocusable(true); - mAppRestrictView.setOnClickListener(mAppRestrictListener); + mAppRestrictView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mRestrictSpinner.performClick(); + } + }); mAppSwitches.addView(mAppRestrictView); + + //switch for per app data alert enable/disable + mAppDataAlert = new Switch(inflater.getContext()); + mAppDataAlert.setClickable(false); + mAppDataAlert.setFocusable(false); + mAppDataAlertView = inflatePreference(inflater, mAppSwitches, mAppDataAlert); + mAppDataAlertView.setClickable(true); + mAppDataAlertView.setFocusable(true); + mAppDataAlertView.setOnClickListener(mAppDataAlertListner); + mAppSwitches.addView(mAppDataAlertView); + + // check if content provider is installed. If not, hide data alert switch + mDataAlertsSupported = DataUsageUtils.isDbEnabled(context); + if (!mDataAlertsSupported) { + mAppDataAlertView.setVisibility(View.GONE); + } + + // switch for per app cellular access enabled/disable + mAppCellularAccess = new Switch(inflater.getContext()); + mAppCellularAccess.setClickable(false); + mAppCellularAccess.setFocusable(false); + mAppCellularAccessView = inflatePreference(inflater, mAppSwitches, mAppCellularAccess); + mAppCellularAccessView.setClickable(true); + mAppCellularAccessView.setFocusable(true); + mAppCellularAccessView.setOnClickListener(mAppRestrictCellularListener); + mAppSwitches.addView(mAppCellularAccessView); } mDisclaimer = mHeader.findViewById(R.id.disclaimer); @@ -591,6 +646,17 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable help.setVisible(false); } + mMenuDataAlerts = menu.findItem(R.id.data_usage_menu_data_alerts); + + if (mDataAlertsSupported) { + mMenuDataAlerts.setVisible(!appDetailMode); + } else { + mMenuDataAlerts.setVisible(false); + } + + mMenuResetStats = menu.findItem(R.id.data_usage_menu_reset_stats); + mMenuResetStats.setVisible(!appDetailMode); + updateMenuTitles(); } @@ -612,6 +678,11 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable } else { mMenuShowEthernet.setTitle(R.string.data_usage_menu_show_ethernet); } + if (mShowAlerts) { + mMenuDataAlerts.setTitle(R.string.data_usage_menu_disable_data_alerts); + } else { + mMenuDataAlerts.setTitle(R.string.data_usage_menu_enable_data_alerts); + } } @Override @@ -658,6 +729,14 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable R.string.data_usage_metered_title, null, this, 0); return true; } + case R.id.data_usage_menu_reset_stats: { + ConfirmDataResetFragment.show(DataUsageSummary.this, mTemplate); + return true; + } + case R.id.data_usage_menu_data_alerts: { + updateShowAlertsState(!mShowAlerts); + return true; + } } return false; } @@ -675,6 +754,13 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable super.onDestroy(); } + private void updateShowAlertsState(boolean showAlert) { + mShowAlerts = showAlert; + mPrefs.edit().putBoolean(PREF_ENABLE_DATA_USAGE_NOTIFY, mShowAlerts).apply(); + updateMenuTitles(); + DataUsageUtils.enableDataUsageService(getContext(), mShowAlerts); + } + /** * Build and assign {@link LayoutTransition} to various containers. Should * only be assigned after initial layout is complete. @@ -1026,17 +1112,52 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable updateDetailData(); - if (UserHandle.isApp(uid) && !mPolicyManager.getRestrictBackground() - && isBandwidthControlEnabled() && hasReadyMobileRadio(context)) { - setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background); - setPreferenceSummary(mAppRestrictView, - getString(R.string.data_usage_app_restrict_background_summary)); + if (UserHandle.isApp(uid) && isBandwidthControlEnabled()) { + setPreferenceTitle(mAppRestrictView, R.string.background_data_access); + int backgroundPolicy = getAppRestrictBackground(); + final int summaryResId, position; + if ((backgroundPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) { + if ((backgroundPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) { + summaryResId = R.string.allow_background_none; + position = DATA_USAGE_BACKGROUND_NO_ACCESS; + } else { + summaryResId = R.string.allow_background_wlan; + position = DATA_USAGE_BACKGROUND_WLAN_ACCESS; + } + } else { + summaryResId = R.string.allow_background_both; + position = DATA_USAGE_BACKGROUND_FULL_ACCESS; + } + setPreferenceSummary(mAppRestrictView, getString(summaryResId)); + mRestrictSpinner.setSelection(position); mAppRestrictView.setVisibility(View.VISIBLE); - mAppRestrict.setChecked(getAppRestrictBackground()); + if (isMobileTab(mCurrentTab) || TAB_3G.equals(mCurrentTab) + || TAB_4G.equals(mCurrentTab)) { + setPreferenceTitle(mAppCellularAccessView, R.string.restrict_cellular_access_title); + setPreferenceSummary(mAppCellularAccessView, + getString(R.string.restrict_cellular_access_summary)); + mAppCellularAccessView.setVisibility(View.VISIBLE); + mAppCellularAccess.setChecked(getAppRestrictCellular()); + } else { + mAppCellularAccessView.setVisibility(View.GONE); + } + + if (mDataAlertsSupported) { + setPreferenceTitle(mAppDataAlertView, R.string.mobile_data_alert); + setPreferenceSummary(mAppDataAlertView, + getString(R.string.mobile_data_alert_summary)); + + mAppDataAlertView.setVisibility(View.VISIBLE); + mAppDataAlert.setChecked(getAppDataAlert()); + } else { + mAppDataAlertView.setVisibility(View.GONE); + } } else { mAppRestrictView.setVisibility(View.GONE); + mAppDataAlertView.setVisibility(View.GONE); + mAppCellularAccessView.setVisibility(View.GONE); } } @@ -1090,6 +1211,29 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable updatePolicy(false); } + private void resetDataStats(NetworkTemplate template) { + // kick off background task to reset stats + new AsyncTask<Void, Void, Void>() { + @Override + protected Void doInBackground(Void... params) { + try { + mStatsService.resetDataUsageHistoryForAllUid(mTemplate); + mPolicyEditor.setPolicyLimitBytes(mTemplate, + mPolicyEditor.getPolicyLimitBytes(mTemplate)); + mStatsService.forceUpdate(); + } catch (RemoteException e) { + + } + return null; + } + @Override + protected void onPostExecute (Void result) { + updateBody(); + } + + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + private boolean isNetworkPolicyModifiable(NetworkPolicy policy) { return policy != null && isBandwidthControlEnabled() && mDataEnabled.isChecked() && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER; @@ -1109,18 +1253,106 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable updateMenuTitles(); } - private boolean getAppRestrictBackground() { + private int getAppRestrictBackground() { final int uid = mCurrentApp.key; final int uidPolicy = mPolicyManager.getUidPolicy(uid); - return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0; + + return ((uidPolicy & POLICY_REJECT_METERED_BACKGROUND) | (uidPolicy & + POLICY_REJECT_ON_WLAN_BACKGROUND)); } - private void setAppRestrictBackground(boolean restrictBackground) { + private void setAppRestrictBackground(int newPolicy) { if (LOGD) Log.d(TAG, "setAppRestrictBackground()"); final int uid = mCurrentApp.key; - mPolicyManager.setUidPolicy( - uid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE); - mAppRestrict.setChecked(restrictBackground); + final int currentPolicy = mPolicyManager.getUidPolicy(uid); + + if (newPolicy == currentPolicy) { + return; + } + + if (((newPolicy & POLICY_REJECT_METERED_BACKGROUND) ^ (currentPolicy & + POLICY_REJECT_METERED_BACKGROUND)) != 0 ) { + if ((newPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) { + mPolicyManager.addUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND); + } else { + mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND); + } + } + + if (((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) ^ (currentPolicy & + POLICY_REJECT_ON_WLAN_BACKGROUND)) != 0 ) { + if ((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) { + mPolicyManager.addUidPolicy(uid, POLICY_REJECT_ON_WLAN_BACKGROUND); + } else { + mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_ON_WLAN_BACKGROUND); + } + } + + final int summaryResId; + if ((newPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) { + if ((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) { + summaryResId = R.string.allow_background_none; + } else { + summaryResId = R.string.allow_background_wlan; + } + } else { + summaryResId = R.string.allow_background_both; + } + setPreferenceSummary(mAppRestrictView, getString(summaryResId)); + } + + private boolean getAppRestrictCellular() { + final int uid = mCurrentApp.key; + final int uidPolicy = mPolicyManager.getUidPolicy(uid); + return (uidPolicy & POLICY_REJECT_ON_DATA) != 0; + } + + private void setAppRestrictCellular(boolean restrictCellular) { + if (LOGD) Log.d(TAG, "setAppRestrictCellular()"); + final int uid = mCurrentApp.key; + if (restrictCellular) { + mPolicyManager.addUidPolicy(uid, POLICY_REJECT_ON_DATA); + } else { + mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_ON_DATA); + } + mAppCellularAccess.setChecked(restrictCellular); + } + + + private void setAppDataAlert(boolean enableDataAlert) { + final int uid = mCurrentApp.key; + + // Get app's details to send to the DataUsage Provider. Don't block if not in the + // DetailProvider cache. (should be in the cache, as the app's label had already + // been displayed in the list of apps) + UidDetail detail = mUidDetailProvider.getUidDetail(uid, false); + String label = detail != null ? detail.label.toString() : ""; + + try { + DataUsageUtils.enableApp(getContext(), uid, enableDataAlert, label); + } catch (Exception e) { + //content provider may not be installed. + Log.d(TAG, "Unable to set data alert state"); + return; + } + mAppDataAlert.setChecked(enableDataAlert); + + // automatically enable global alert for notifications when enabling first per app alert + if (enableDataAlert && !mShowAlerts) { + updateShowAlertsState(true); + } + } + + private boolean getAppDataAlert() { + final int uid = mCurrentApp.key; + + try { + return DataUsageUtils.isAppEnabled(getContext(), uid); + } catch (Exception e) { + //content provider may not be installed. + Log.d(TAG, "Unable to get data alert state"); + return false; + } } /** @@ -1298,22 +1530,53 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable } }; - private View.OnClickListener mAppRestrictListener = new View.OnClickListener() { + private AdapterView.OnItemSelectedListener mAppRestrictListener = + new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView<?> parent, View v, int position, long id) { + final int backgroundPolicy; + + if (position == DATA_USAGE_BACKGROUND_WLAN_ACCESS) { + backgroundPolicy = POLICY_REJECT_METERED_BACKGROUND; + } else if (position == DATA_USAGE_BACKGROUND_NO_ACCESS) { + backgroundPolicy = POLICY_REJECT_METERED_BACKGROUND | + POLICY_REJECT_ON_WLAN_BACKGROUND; + } else { + backgroundPolicy = DATA_USAGE_BACKGROUND_FULL_ACCESS; + } + setAppRestrictBackground(backgroundPolicy); + } + + @Override + public void onNothingSelected(AdapterView<?> parent) { + // noop + } + }; + + private View.OnClickListener mAppRestrictCellularListener = new View.OnClickListener() { @Override public void onClick(View v) { - final boolean restrictBackground = !mAppRestrict.isChecked(); + final boolean restrictCellular = !mAppCellularAccess.isChecked(); - if (restrictBackground) { + if (restrictCellular) { // enabling restriction; show confirmation dialog which - // eventually calls setRestrictBackground() once user + // eventually calls setRestrictCellular() once user // confirms. - ConfirmAppRestrictFragment.show(DataUsageSummary.this); + ConfirmAppRestrictCellularFragment.show(DataUsageSummary.this); } else { - setAppRestrictBackground(false); + setAppRestrictCellular(false); } } }; + private View.OnClickListener mAppDataAlertListner = new View.OnClickListener() { + @Override + public void onClick(View v) { + final boolean enableDataAlert = !mAppDataAlert.isChecked(); + setAppDataAlert(enableDataAlert); + } + }; + private OnItemClickListener mListListener = new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { @@ -2199,6 +2462,45 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable } /** + * Dialog to request user confirmation before resetting data. + */ + public static class ConfirmDataResetFragment extends DialogFragment { + static NetworkTemplate mTemplate; + public static void show(DataUsageSummary parent, NetworkTemplate template) { + mTemplate = template; + if (!parent.isAdded()) return; + + final ConfirmDataResetFragment dialog = new ConfirmDataResetFragment(); + dialog.setTargetFragment(parent, 0); + dialog.show(parent.getFragmentManager(), TAG_CONFIRM_DATA_RESET); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Context context = getActivity(); + + final AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(R.string.data_usage_menu_reset_stats); + builder.setMessage(R.string.reset_data_stats_msg); + + builder.setPositiveButton(R.string.reset_stats_confirm, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + final DataUsageSummary target = (DataUsageSummary) getTargetFragment(); + if (target != null) { + // TODO: extend to modify policy enabled flag. + target.resetDataStats(mTemplate); + } + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + + return builder.create(); + } + } + + /** * Dialog to request user confirmation before setting * {@link INetworkPolicyManager#setRestrictBackground(boolean)}. */ @@ -2267,15 +2569,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable /** * Dialog to request user confirmation before setting - * {@link #POLICY_REJECT_METERED_BACKGROUND}. + * {@link #POLICY_REJECT_ON_DATA}. */ - public static class ConfirmAppRestrictFragment extends DialogFragment { + public static class ConfirmAppRestrictCellularFragment extends DialogFragment { public static void show(DataUsageSummary parent) { if (!parent.isAdded()) return; - final ConfirmAppRestrictFragment dialog = new ConfirmAppRestrictFragment(); + final ConfirmAppRestrictCellularFragment dialog = new + ConfirmAppRestrictCellularFragment(); dialog.setTargetFragment(parent, 0); - dialog.show(parent.getFragmentManager(), TAG_CONFIRM_APP_RESTRICT); + dialog.show(parent.getFragmentManager(), TAG_CONFIRM_APP_RESTRICT_CELLULAR); } @Override @@ -2283,15 +2586,15 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final Context context = getActivity(); final AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.data_usage_app_restrict_dialog_title); - builder.setMessage(R.string.data_usage_app_restrict_dialog); + builder.setTitle(R.string.restrict_cellular_access_dialog_title); + builder.setMessage(R.string.restrict_cellular_access_dialog_summary); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { final DataUsageSummary target = (DataUsageSummary) getTargetFragment(); if (target != null) { - target.setAppRestrictBackground(true); + target.setAppRestrictCellular(true); } } }); @@ -2517,6 +2820,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable return view; } + private static View inflatePreferenceWithInvisibleWidget(LayoutInflater inflater, + ViewGroup root, View widget) { + final ViewGroup view = (ViewGroup) inflater.inflate(R.layout.preference, root, false); + view.addView(widget, 0); + final ViewGroup.LayoutParams lp = widget.getLayoutParams(); + lp.width = 0; + widget.setLayoutParams(lp); + return view; + } + /** * Test if any networks are currently limited. */ diff --git a/src/com/android/settings/DataUsageUtils.java b/src/com/android/settings/DataUsageUtils.java new file mode 100644 index 0000000..5f08067 --- /dev/null +++ b/src/com/android/settings/DataUsageUtils.java @@ -0,0 +1,121 @@ +package com.android.settings; + + +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; +import android.database.Cursor; +import android.util.Log; + +import cyanogenmod.providers.DataUsageContract; + + +/** + * This class contains utility helper functions for accessing DataUsageProvider + */ +public class DataUsageUtils { + private static final String TAG = DataUsageUtils.class.getSimpleName(); + private static final int DATAUSAGE_SERVICE_ALARM_ID = 0x102030; + private static boolean DEBUG = true; + + public static void addApp(Context context, int uid, String label) { + if (DEBUG) { + Log.v(TAG, "addApp: uid:" + uid + " label:" + label); + } + + ContentValues values = new ContentValues(); + + values.put(DataUsageContract.UID, uid); + values.put(DataUsageContract.LABEL, label); + + context.getContentResolver().insert( + DataUsageContract.CONTENT_URI, + values + ); + } + + public static void removeApp(Context context, int uid) { + if (DEBUG) { + Log.v(TAG, "removeApp: uid:" + uid); + } + context.getContentResolver().delete( + DataUsageContract.CONTENT_URI, + DataUsageContract.UID + " = ? ", + new String [] { String.valueOf(uid)} + ); + } + + public static void enableApp(Context context, int uid, boolean enable) { + enableApp(context, uid, enable, null); + } + + public static void enableApp(Context context, int uid, boolean enable, String label) { + if (DEBUG) { + Log.v(TAG, "enableApp: uid:" + uid + " enable:" + enable + + (label == null ? "" : " label:" + label)); + } + ContentValues values = new ContentValues(); + + values.put(DataUsageContract.ENABLE, enable); + values.put(DataUsageContract.ACTIVE, 0); + if (label != null) { + values.put(DataUsageContract.LABEL, label); + } + context.getContentResolver().update( + DataUsageContract.CONTENT_URI, + values, + DataUsageContract.UID + " = ? ", + new String [] { String.valueOf(uid)} + ); + } + + public static boolean isDbEnabled(Context context) { + boolean dbEnabled = false; + Cursor cursor = context.getContentResolver().query( + DataUsageContract.CONTENT_URI, + null, + DataUsageContract.UID + " = ? ", + new String [] { String.valueOf("0") }, + null + ); + + if (cursor != null) { + cursor.close(); + dbEnabled = true; + } + return dbEnabled; + } + + + public static boolean isAppEnabled(Context context, int uid) { + boolean appEnabled = false; + Cursor cursor = context.getContentResolver().query( + DataUsageContract.CONTENT_URI, + null, + DataUsageContract.UID + " = ? ", + new String [] { String.valueOf(uid) }, + null + ); + if (cursor != null) { + if (cursor.moveToFirst()) { + appEnabled = cursor.getInt(DataUsageContract.COLUMN_OF_ENABLE) == 1; + } + cursor.close(); + } + + if (DEBUG) { + Log.v(TAG, "isAppEnabled: uid:" + uid + " enabled:" + appEnabled); + } + + return appEnabled; + } + + public static void enableDataUsageService(Context context, boolean enable) { + Intent intent = new Intent(); + intent.setAction("org.cyanogenmod.providers.datausage.enable"); + intent.putExtra("enable", enable); + context.sendBroadcast(intent); + } +} |