From a12c0a3ff1fdaecf15813de454a5db2de966d5e5 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Wed, 19 Oct 2016 13:39:33 +0200 Subject: Add setup UI for minimum delay between an app's notification sounds. Change-Id: I70e9cc308b4f7c7681457a0b09dd73e5d1aebb73 --- .../notification/AppNotificationSettings.java | 37 ++++++++++++++++++++++ .../settings/notification/NotificationBackend.java | 21 ++++++++++++ 2 files changed, 58 insertions(+) (limited to 'src') diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 22df064..2e76f92 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -27,6 +27,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; +import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; @@ -61,6 +62,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { private static final String KEY_APP_SETTINGS = "app_settings"; private static final String KEY_SHOW_ON_KEYGUARD = "show_on_keyguard"; private static final String KEY_NO_ONGOING_ON_KEYGUARD = "no_ongoing_on_keyguard"; + private static final String KEY_SOUND_TIMEOUT = "sound_timeout"; private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT = new Intent(Intent.ACTION_MAIN) @@ -75,6 +77,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { private SwitchPreference mSensitive; private SwitchPreference mShowOnKeyguard; private SwitchPreference mShowNoOngoingOnKeyguard; + private ListPreference mSoundTimeout; private AppRow mAppRow; private boolean mCreated; private boolean mIsSystemPackage; @@ -143,6 +146,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE); mShowOnKeyguard = (SwitchPreference) findPreference(KEY_SHOW_ON_KEYGUARD); mShowNoOngoingOnKeyguard = (SwitchPreference) findPreference(KEY_NO_ONGOING_ON_KEYGUARD); + mSoundTimeout = (ListPreference) findPreference(KEY_SOUND_TIMEOUT); mAppRow = mBackend.loadAppRow(pm, info.applicationInfo); @@ -156,6 +160,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { mPriority.setChecked(mAppRow.priority); mPeekable.setChecked(mAppRow.peekable); mSensitive.setChecked(mAppRow.sensitive); + mSoundTimeout.setValue(Long.toString(mAppRow.soundTimeout)); + updateSoundTimeoutSummary(mAppRow.soundTimeout); mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override @@ -196,6 +202,18 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { } }); + mSoundTimeout.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + long value = Long.valueOf((String) newValue); + if (!mBackend.setNotificationSoundTimeout(pkg, mUid, value)) { + return false; + } + updateSoundTimeoutSummary(value); + return true; + } + }); + if (mAppRow.settingsIntent != null) { findPreference(KEY_APP_SETTINGS).setOnPreferenceClickListener( new OnPreferenceClickListener() { @@ -260,6 +278,25 @@ public class AppNotificationSettings extends SettingsPreferenceFragment { } } + private void updateSoundTimeoutSummary(long value) { + if (value == 0) { + mSoundTimeout.setSummary(R.string.app_notification_sound_timeout_value_none); + } else { + final CharSequence[] entries = mSoundTimeout.getEntries(); + final CharSequence[] values = mSoundTimeout.getEntryValues(); + CharSequence summary = null; + for (int i = 0; i < values.length; i++) { + long timeout = Long.parseLong(values[i].toString()); + if (timeout == value) { + summary = getString(R.string.app_notification_sound_timeout_summary_template, + entries[i]); + break; + } + } + mSoundTimeout.setSummary(summary); + } + } + private void updateDependents(boolean banned) { final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure( UserHandle.myUserId()); diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index 5467cb3..ae83179 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -47,6 +47,7 @@ public class NotificationBackend { row.priority = getHighPriority(row.pkg, row.uid); row.peekable = getPeekable(row.pkg, row.uid); row.sensitive = getSensitive(row.pkg, row.uid); + row.soundTimeout = getNotificationSoundTimeout(row.pkg, row.uid); return row; } @@ -149,6 +150,25 @@ public class NotificationBackend { } } + public long getNotificationSoundTimeout(String pkg, int uid) { + try { + return sINM.getPackageNotificationSoundTimeout(pkg, uid); + } catch (Exception e) { + Log.w(TAG, "Error calling NoMan", e); + return 0; + } + } + + public boolean setNotificationSoundTimeout(String pkg, int uid, long timeout) { + try { + sINM.setPackageNotificationSoundTimeout(pkg, uid, timeout); + return true; + } catch (Exception e) { + Log.w(TAG, "Error calling NoMan", e); + return false; + } + } + static class Row { public String section; } @@ -164,6 +184,7 @@ public class NotificationBackend { public boolean peekable; public boolean sensitive; public boolean first; // first app in section + public long soundTimeout; } } -- cgit v1.1