summaryrefslogtreecommitdiffstats
path: root/net/android
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 16:59:34 +0000
committerdigit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 16:59:34 +0000
commitf1bdf1c72a39f47c133f7a45ff441849ec8b496b (patch)
treedb89f58152e350dd2afc52b127f7773e39c6b0f3 /net/android
parentcbf03ba141434e753c517370696d93b43d8582d5 (diff)
downloadchromium_src-f1bdf1c72a39f47c133f7a45ff441849ec8b496b.zip
chromium_src-f1bdf1c72a39f47c133f7a45ff441849ec8b496b.tar.gz
chromium_src-f1bdf1c72a39f47c133f7a45ff441849ec8b496b.tar.bz2
android: Improve ActivityStatus and add ChromiumActivity.
The ActivityStatus class used to track activity state changes is too basic for some usage scenarios. This patch does the following: - Augment ActivityStatus with a new StateListener type that can be registered to listen to all activity state changes. Also add getActivity(), getState(), registerStateListener() and unregisterStateListener() as static method. - Add a new ChromiumActivity class that all Chromium main activities should sub-class, to ensure that the ActivityStatus state is updated appropriately. - Modify all main activities in the Chromium code base to extend from ChromiumActivity instead of Activity. BUG=none Review URL: https://chromiumcodereview.appspot.com/11419287 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
-rw-r--r--net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
index c5fd033..90aa753 100644
--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
@@ -21,7 +21,7 @@ import org.chromium.base.ActivityStatus;
* ACCESS_NETWORK_STATE permission.
*/
public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
- implements ActivityStatus.Listener {
+ implements ActivityStatus.StateListener {
/** Queries the ConnectivityManager for information about the current connection. */
static class ConnectivityManagerDelegate {
@@ -73,11 +73,10 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
mConnectivityManagerDelegate = new ConnectivityManagerDelegate(context);
mConnectionType = currentConnectionType(context);
- ActivityStatus status = ActivityStatus.getInstance();
- if (!status.isPaused()) {
+ if (ActivityStatus.getState() != ActivityStatus.PAUSED) {
registerReceiver();
}
- status.registerListener(this);
+ ActivityStatus.registerStateListener(this);
}
/**
@@ -168,12 +167,12 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
}
}
- // AcitivityStatus.Listener
+ // ActivityStatus.StateListener
@Override
- public void onActivityStatusChanged(boolean isPaused) {
- if (isPaused) {
+ public void onActivityStateChange(int state) {
+ if (state == ActivityStatus.PAUSED) {
unregisterReceiver();
- } else {
+ } else if (state == ActivityStatus.RESUMED) {
registerReceiver();
}
}