Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

Issue 942103003: Handle notification preferences intent from gear icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 9f14d5d4615cee18614e644a2770de4e9b80fa6c..1eb022ad8a7b93bd3d1ac1fba7069a4beb9c2539 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -6,6 +6,7 @@
import android.app.Activity;
import android.app.FragmentManager;
+import android.app.Notification;
import android.content.Intent;
import android.os.Bundle;
import android.provider.Browser;
@@ -39,6 +40,7 @@
import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
import org.chromium.chrome.browser.nfc.BeamController;
import org.chromium.chrome.browser.nfc.BeamProvider;
+import org.chromium.chrome.browser.notifications.NotificationUIManager;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.printing.PrintingControllerFactory;
import org.chromium.chrome.browser.printing.TabPrinter;
@@ -209,6 +211,12 @@ public String getTabUrlForBeam() {
return tab.getUrl();
}
});
+
+ // The notification settings cog on the flipped side of Notifications and in the Android
Peter Beverloo 2015/02/25 18:26:09 I would have expected this to be in onNewIntent().
Michael van Ouwerkerk 2015/02/25 19:00:19 That's also what I expected, but I could find no w
+ // Settings "App Notifications" view will open us with a specific category.
+ if (getIntent().hasCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES)) {
+ NotificationUIManager.launchNotificationPreferences(this, getIntent());
+ }
}
@Override

Powered by Google App Engine
This is Rietveld 408576698