chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java - Issue 942103003: Handle notification preferences intent from gear icon.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « chrome/android/shell/java/AndroidManifest.xml.jinja2 ('k') | chrome/browser/notifications/notification_ui_manager_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b097efb48305c2a02758a98b563dabe6b663ee5f..d1fd4eef3b6e1beb4cd3adc59537f4f30dfb9845 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

+ // Settings "App Notifications" view will open us with a specific category.

+ if (getIntent().hasCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES)) {

+ NotificationUIManager.launchNotificationPreferences(this, getIntent());

+ }

}

@Override