PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate from setting to NotificationManager.

Browse Source 
Test: manual; changing settings and confirming with bugreport
Change-Id: I1595fc3ceca8cd31d5bece52dff75aebe29d2ae3
This commit is contained in:
Julia Reynolds
2017-06-09 15:00:14 -04:00
parent ec102eb32e
commit ee4b6ba6ae
8 changed files with 82 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -41,7 +41,6 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
private static final String TAG = NotificationAccessSettings.class.getSimpleName();
private static final Config CONFIG = getNotificationListenerConfig();
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -70,10 +69,11 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
return CONFIG;
}
@Override
protected boolean setEnabled(ComponentName service, String title, boolean enable) {
logSpecialPermissionChange(enable, service.getPackageName());
if (!enable) {
if (!mServiceListing.isEnabled(service)) {
if (!isServiceEnabled(service)) {
return true; // already disabled
}
// show a friendly dialog
@@ -82,10 +82,27 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
.show(getFragmentManager(), "friendlydialog");
return false;
} else {
return super.setEnabled(service, title, enable);
if (isServiceEnabled(service)) {
return true; // already enabled
}
// show a scary dialog
new ScaryWarningDialogFragment()
.setServiceInfo(service, title, this)
.show(getFragmentManager(), "dialog");
return false;
}
}
@Override
protected boolean isServiceEnabled(ComponentName cn) {
return mNm.isNotificationListenerAccessGranted(cn);
}
@Override
protected void enable(ComponentName service) {
mNm.setNotificationListenerAccessGranted(service, true);
}
@VisibleForTesting
void logSpecialPermissionChange(boolean enable, String packageName) {
int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
@@ -94,17 +111,14 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
logCategory, packageName);
}
private static void disable(final Context context, final NotificationAccessSettings parent,
final ComponentName cn) {
parent.mServiceListing.setEnabled(cn, false);
private static void disable(final NotificationAccessSettings parent, final ComponentName cn) {
parent.mNm.setNotificationListenerAccessGranted(cn, false);
AsyncTask.execute(new Runnable() {
@Override
public void run() {
final NotificationManager mgr = context.getSystemService(NotificationManager.class);
if (!mgr.isNotificationPolicyAccessGrantedForPackage(
if (!parent.mNm.isNotificationPolicyAccessGrantedForPackage(
cn.getPackageName())) {
mgr.removeAutomaticZenRules(cn.getPackageName());
parent.mNm.removeAutomaticZenRules(cn.getPackageName());
}
}
});
@@ -145,7 +159,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
.setPositiveButton(R.string.notification_listener_disable_warning_confirm,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
disable(getContext(), parent, cn);
disable(parent, cn);
}
})
.setNegativeButton(R.string.notification_listener_disable_warning_cancel,