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

Merge "Remove gentle/alerting icons from channel settings" into qt-dev

Browse Source 
am: 535f0489c9

Change-Id: I6925501e09124c1b6907f599254db0ea7adbc4ac
This commit is contained in:
Evan Laird
2019-05-23 13:36:17 -07:00
committed by android-build-merger
parent da74cc8cc7 535f0489c9
commit 81141a5918
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -53,6 +53,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
@@ -279,6 +280,12 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
return null; return null;
} }
private Drawable getAlertingIcon() {
Drawable icon = getContext().getDrawable(R.drawable.ic_notifications);
icon.setTintList(Utils.getColorAccent(getContext()));
return icon;
}
protected Preference populateSingleChannelPrefs(PreferenceGroup parent, protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
final NotificationChannel channel, final boolean groupBlocked) { final NotificationChannel channel, final boolean groupBlocked) {
MasterSwitchPreference channelPref = new MasterSwitchPreference(getPrefContext()); MasterSwitchPreference channelPref = new MasterSwitchPreference(getPrefContext());
@@ -286,8 +293,10 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
&& isChannelBlockable(channel) && isChannelBlockable(channel)
&& isChannelConfigurable(channel) && isChannelConfigurable(channel)
&& !groupBlocked); && !groupBlocked);
channelPref.setIcon(channel.getImportance() > IMPORTANCE_LOW channelPref.setIcon(null);
? R.drawable.ic_notification_alert : R.drawable.ic_notification_silence); if (channel.getImportance() > IMPORTANCE_LOW) {
channelPref.setIcon(getAlertingIcon());
}
channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL); channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL);
channelPref.setKey(channel.getId()); channelPref.setKey(channel.getId());
channelPref.setTitle(channel.getName()); channelPref.setTitle(channel.getName());
@@ -314,9 +323,10 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
channel.lockFields( channel.lockFields(
NotificationChannel.USER_LOCKED_IMPORTANCE); NotificationChannel.USER_LOCKED_IMPORTANCE);
MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference; MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference;
channelPref1.setIcon(channel.getImportance() > IMPORTANCE_LOW channelPref1.setIcon(null);
? R.drawable.ic_notification_alert if (channel.getImportance() > IMPORTANCE_LOW) {
: R.drawable.ic_notification_silence); channelPref1.setIcon(getAlertingIcon());
}
toggleBehaviorIconState(channelPref1.getIcon(), toggleBehaviorIconState(channelPref1.getIcon(),
importance != IMPORTANCE_NONE); importance != IMPORTANCE_NONE);
mBackend.updateChannel(mPkg, mUid, channel); mBackend.updateChannel(mPkg, mUid, channel);
@@ -330,9 +340,14 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
} }
private void toggleBehaviorIconState(Drawable icon, boolean enabled) { private void toggleBehaviorIconState(Drawable icon, boolean enabled) {
if (icon == null) return;
LayerDrawable layerDrawable = (LayerDrawable) icon; LayerDrawable layerDrawable = (LayerDrawable) icon;
GradientDrawable background = GradientDrawable background =
(GradientDrawable) layerDrawable.findDrawableByLayerId(R.id.back); (GradientDrawable) layerDrawable.findDrawableByLayerId(R.id.back);
if (background == null) return;
if (enabled) { if (enabled) {
background.clearColorFilter(); background.clearColorFilter();
} else { } else {