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

Notification settings updates

Browse Source 
- Text changes
- Show channels on the app settings screen (again)
- Hide most of the channel settings under 'advanced' (note: this hides
  the footer preference(s) also, at the moment. the functionality
  to exclude those is coming in a later cl)
  - Add a 'show notifications' toggle for each app created group

Bug: 63927402
Test: make RunSettingsRoboTests

Change-Id: I9906ef943d05e1915061b59294a25d81c4e6cbb5
This commit is contained in:
Julia Reynolds
2017-12-21 13:28:20 -05:00
parent 9c3d329de6
commit 3527ef7c29
8 changed files with 80 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/notification/ImportancePreferenceController.java
View File

@@ -73,7 +73,8 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
if (preference.isEnabled()) {
Intent channelIntent = Utils.onBuildStartFragmentIntent(mContext,
ChannelImportanceSettings.class.getName(),
channelArgs, null, R.string.notification_importance_title, null,
channelArgs, null,
R.string.notification_importance_title, null,
false, getMetricsCategory());
preference.setIntent(channelIntent);
preference.setSummary(getImportanceSummary(mContext, mChannel));
@@ -82,23 +83,19 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
}
protected static String getImportanceSummary(Context context, NotificationChannel channel) {
String title;
String summary = null;
String summary = "";
int importance = channel.getImportance();
switch (importance) {
case IMPORTANCE_UNSPECIFIED:
title = context.getString(R.string.notification_importance_unspecified);
summary = context.getString(R.string.notification_importance_unspecified);
break;
case NotificationManager.IMPORTANCE_MIN:
title = context.getString(R.string.notification_importance_min_title);
summary = context.getString(R.string.notification_importance_min);
break;
case NotificationManager.IMPORTANCE_LOW:
title = context.getString(R.string.notification_importance_low_title);
summary = context.getString(R.string.notification_importance_low);
break;
case NotificationManager.IMPORTANCE_DEFAULT:
title = context.getString(R.string.notification_importance_default_title);
if (SoundPreferenceController.hasValidSound(channel)) {
summary = context.getString(R.string.notification_importance_default);
} else {
@@ -107,7 +104,6 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
break;
case NotificationManager.IMPORTANCE_HIGH:
case NotificationManager.IMPORTANCE_MAX:
title = context.getString(R.string.notification_importance_high_title);
if (SoundPreferenceController.hasValidSound(channel)) {
summary = context.getString(R.string.notification_importance_high);
} else {
@@ -118,10 +114,6 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
return "";
}
if (summary != null) {
return context.getString(R.string.notification_importance_divider, title, summary);
} else {
return title;
}
return summary;
}
}