From 7b182d706649466a3a803afdc0c0291369f001ff Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 8 Jul 2011 10:30:53 -0700
Subject: [PATCH] Handle MANAGE_NETWORK_USAGE intent
Bug: 4726553
Change-Id: I790ff56ae0dceb742a225d8b1edd7076997a517f
---
AndroidManifest.xml | 4 ++++
.../browser/BrowserPreferencesPage.java | 22 +++++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f11f8ce..26ea91e3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -162,6 +162,10 @@
</activity>
<activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences">
+ <intent-filter>
+ <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<activity android:name="BookmarkSearch"
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 83020112..930e1db5 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -16,18 +16,21 @@
package com.android.browser;
-import com.android.browser.preferences.DebugPreferencesFragment;
-
import android.app.ActionBar;
+import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.MenuItem;
+import com.android.browser.preferences.BandwidthPreferencesFragment;
+import com.android.browser.preferences.DebugPreferencesFragment;
+
import java.util.List;
public class BrowserPreferencesPage extends PreferenceActivity {
public static final String CURRENT_PAGE = "currentPage";
+ private List<Header> mHeaders;
@Override
public void onCreate(Bundle icicle) {
@@ -53,6 +56,21 @@ public class BrowserPreferencesPage extends PreferenceActivity {
debug.fragment = DebugPreferencesFragment.class.getName();
target.add(debug);
}
+ mHeaders = target;
+ }
+
+ @Override
+ public Header onGetInitialHeader() {
+ String action = getIntent().getAction();
+ if (Intent.ACTION_MANAGE_NETWORK_USAGE.equals(action)) {
+ String fragName = BandwidthPreferencesFragment.class.getName();
+ for (Header h : mHeaders) {
+ if (fragName.equals(h.fragment)) {
+ return h;
+ }
+ }
+ }
+ return super.onGetInitialHeader();
}
@Override
--
GitLab