diff options
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 11 | ||||
| -rw-r--r-- | src/com/android/settings/AccessibilityTutorialActivity.java | 32 | ||||
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 66 | ||||
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 11 | ||||
| -rw-r--r-- | src/com/android/settings/net/NetworkPolicyEditor.java | 25 |
6 files changed, 54 insertions, 97 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 22b2226..9712a63 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1180,12 +1180,6 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - <intent-filter> - <!-- actions from NetworkPolicyManager notifications --> - <action android:name="android.intent.action.DATA_USAGE_WARNING" /> - <action android:name="android.intent.action.DATA_USAGE_LIMIT" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.DataUsageSummary" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" diff --git a/res/values/strings.xml b/res/values/strings.xml index 6c26cbc..47fed2f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3454,17 +3454,6 @@ found in the list of installed applications.</string> <!-- Body of dialog shown before user limits 4G data usage. [CHAR LIMIT=NONE] --> <string name="data_usage_limit_dialog_4g">Your 4G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string> - <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] --> - <string name="data_usage_disabled_dialog_3g_title">2G-3G data disabled</string> - <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] --> - <string name="data_usage_disabled_dialog_4g_title">4G data disabled</string> - <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] --> - <string name="data_usage_disabled_dialog_mobile_title">Mobile data disabled</string> - <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] --> - <string name="data_usage_disabled_dialog">The specified data usage limit has been reached.\n\nAdditional data use may incur carrier charges.</string> - <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] --> - <string name="data_usage_disabled_dialog_enable">Re-enable data</string> - <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] --> <string name="data_usage_restrict_background_title">Restricting background data</string> <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] --> diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java index 21d0028..9ea9917 100644 --- a/src/com/android/settings/AccessibilityTutorialActivity.java +++ b/src/com/android/settings/AccessibilityTutorialActivity.java @@ -17,6 +17,7 @@ package com.android.settings; import android.app.Activity; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -25,6 +26,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.provider.Settings; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -52,9 +54,6 @@ import java.util.List; * available in Touch Exploration. */ public class AccessibilityTutorialActivity extends Activity { - /** Intent action for launching this activity. */ - public static final String ACTION = "com.android.settings.touchtutorial.LAUNCH_TUTORIAL"; - /** Instance state saving constant for the active module. */ private static final String KEY_ACTIVE_MODULE = "active_module"; @@ -66,6 +65,9 @@ public class AccessibilityTutorialActivity extends Activity { private AccessibilityManager mAccessibilityManager; + /** Should touch exploration be disabled when this activity is paused? */ + private boolean mDisableOnPause; + private final AnimationListener mInAnimationListener = new AnimationListener() { @Override public void onAnimationEnd(Animation animation) { @@ -115,6 +117,30 @@ public class AccessibilityTutorialActivity extends Activity { } @Override + protected void onResume() { + super.onResume(); + + final ContentResolver cr = getContentResolver(); + + if (Settings.Secure.getInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 0) == 0) { + Settings.Secure.putInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1); + mDisableOnPause = true; + } else { + mDisableOnPause = false; + } + } + + @Override + protected void onPause() { + super.onPause(); + + if (mDisableOnPause) { + final ContentResolver cr = getContentResolver(); + Settings.Secure.putInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 0); + } + } + + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 1f433fb..0b5d295 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -20,7 +20,6 @@ import static android.net.ConnectivityManager.TYPE_ETHERNET; import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_WIMAX; import static android.net.NetworkPolicy.LIMIT_DISABLED; -import static android.net.NetworkPolicyManager.ACTION_DATA_USAGE_LIMIT; import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE; import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; @@ -141,7 +140,6 @@ public class DataUsageSummary extends Fragment { private static final String TAG_CONFIRM_ROAMING = "confirmRoaming"; private static final String TAG_CONFIRM_LIMIT = "confirmLimit"; private static final String TAG_CYCLE_EDITOR = "cycleEditor"; - private static final String TAG_POLICY_LIMIT = "policyLimit"; private static final String TAG_CONFIRM_RESTRICT = "confirmRestrict"; private static final String TAG_CONFIRM_APP_RESTRICT = "confirmAppRestrict"; private static final String TAG_APP_DETAILS = "appDetails"; @@ -324,12 +322,6 @@ public class DataUsageSummary extends Fragment { // selected network, and binds chart, cycles and detail list. updateTabs(); - // template and tab has been selected; show dialog if limit passed - final String action = intent.getAction(); - if (ACTION_DATA_USAGE_LIMIT.equals(action)) { - PolicyLimitFragment.show(this); - } - // kick off background task to update stats new AsyncTask<Void, Void, Void>() { @Override @@ -1338,58 +1330,6 @@ public class DataUsageSummary extends Fragment { } /** - * Dialog explaining that {@link NetworkPolicy#limitBytes} has been passed, - * and giving the user an option to bypass. - */ - public static class PolicyLimitFragment extends DialogFragment { - private static final String EXTRA_TITLE_ID = "titleId"; - - public static void show(DataUsageSummary parent) { - final Bundle args = new Bundle(); - - final String currentTab = parent.mCurrentTab; - if (TAB_3G.equals(currentTab)) { - args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_3g_title); - } else if (TAB_4G.equals(currentTab)) { - args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_4g_title); - } else if (TAB_MOBILE.equals(currentTab)) { - args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_mobile_title); - } - - final PolicyLimitFragment dialog = new PolicyLimitFragment(); - dialog.setArguments(args); - dialog.setTargetFragment(parent, 0); - dialog.show(parent.getFragmentManager(), TAG_POLICY_LIMIT); - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - final Context context = getActivity(); - - final int titleId = getArguments().getInt(EXTRA_TITLE_ID); - - final AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(titleId); - builder.setMessage(R.string.data_usage_disabled_dialog); - - builder.setPositiveButton(android.R.string.ok, null); - builder.setNegativeButton(R.string.data_usage_disabled_dialog_enable, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - final DataUsageSummary target = (DataUsageSummary) getTargetFragment(); - if (target != null) { - // TODO: consider "allow 100mb more data", or - // only bypass limit for current cycle. - target.setPolicyLimitBytes(LIMIT_DISABLED); - } - } - }); - - return builder.create(); - } - } - - /** * Dialog to request user confirmation before setting * {@link Settings.Secure#DATA_ROAMING}. */ @@ -1497,8 +1437,10 @@ public class DataUsageSummary extends Fragment { * {@link NetworkPolicyManager#EXTRA_NETWORK_TEMPLATE} extra. */ private static String computeTabFromIntent(Intent intent) { - final int networkTemplate = intent.getIntExtra(EXTRA_NETWORK_TEMPLATE, MATCH_MOBILE_ALL); - switch (networkTemplate) { + final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE); + if (template == null) return null; + + switch (template.getMatchRule()) { case MATCH_MOBILE_3G_LOWER: return TAB_3G; case MATCH_MOBILE_4G: diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 9991725..f5bee3a 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -516,16 +516,13 @@ public class TetherSettings extends SettingsPreferenceFragment mWifiConfig = mDialog.getConfig(); if (mWifiConfig != null) { /** - * if soft AP is running, bring up with new config - * else update the configuration alone + * if soft AP is stopped, bring up + * else restart with new config + * TODO: update config on a running access point when framework support is added */ if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) { + mWifiManager.setWifiApEnabled(null, false); mWifiManager.setWifiApEnabled(mWifiConfig, true); - /** - * There is no tether notification on changing AP - * configuration. Update status with new config. - */ - mWifiApEnabler.updateConfigSummary(mWifiConfig); } else { mWifiManager.setWifiApConfiguration(mWifiConfig); } diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java index 1e64ec2..81cf78e 100644 --- a/src/com/android/settings/net/NetworkPolicyEditor.java +++ b/src/com/android/settings/net/NetworkPolicyEditor.java @@ -17,6 +17,7 @@ package com.android.settings.net; import static android.net.NetworkPolicy.LIMIT_DISABLED; +import static android.net.NetworkPolicy.SNOOZE_NEVER; import static android.net.NetworkPolicy.WARNING_DISABLED; import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER; import static android.net.NetworkTemplate.MATCH_MOBILE_4G; @@ -100,17 +101,23 @@ public class NetworkPolicyEditor { } public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) { - getPolicy(template).cycleDay = cycleDay; + final NetworkPolicy policy = getPolicy(template); + policy.cycleDay = cycleDay; + policy.lastSnooze = SNOOZE_NEVER; writeAsync(); } public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) { - getPolicy(template).warningBytes = warningBytes; + final NetworkPolicy policy = getPolicy(template); + policy.warningBytes = warningBytes; + policy.lastSnooze = SNOOZE_NEVER; writeAsync(); } public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) { - getPolicy(template).limitBytes = limitBytes; + final NetworkPolicy policy = getPolicy(template); + policy.limitBytes = limitBytes; + policy.lastSnooze = SNOOZE_NEVER; writeAsync(); } @@ -155,17 +162,19 @@ public class NetworkPolicyEditor { mPolicies.remove(policy4g); mPolicies.add( new NetworkPolicy(templateAll, restrictive.cycleDay, restrictive.warningBytes, - restrictive.limitBytes)); + restrictive.limitBytes, SNOOZE_NEVER)); writeAsync(); } else if (!beforeSplit && split) { // duplicate existing policy into two rules final NetworkPolicy policyAll = getPolicy(templateAll); mPolicies.remove(policyAll); - mPolicies.add(new NetworkPolicy( - template3g, policyAll.cycleDay, policyAll.warningBytes, policyAll.limitBytes)); - mPolicies.add(new NetworkPolicy( - template4g, policyAll.cycleDay, policyAll.warningBytes, policyAll.limitBytes)); + mPolicies.add( + new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.warningBytes, + policyAll.limitBytes, SNOOZE_NEVER)); + mPolicies.add( + new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.warningBytes, + policyAll.limitBytes, SNOOZE_NEVER)); writeAsync(); } |