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

Conditionally show settings.

Browse Source 
Change-Id: I8e62ed6e2515b76de73d3d25adcfb121f809c646
This commit is contained in:
Julia Reynolds
2015-12-18 11:44:43 -05:00
parent 63196c5f82
commit df01cde11c
7 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/values/strings.xml
View File

@@ -5699,7 +5699,26 @@
<!-- Sound & notification > Notification section: Title for the option managing notifications per topic. [CHAR LIMIT=30] -->
<string name="topic_notifications_title">Topic notifications</string>
<!-- [CHAR LIMIT=100] Notification topic list header -->
<string name="notification_topic_categories">Categories</string>
<!-- [CHAR LIMIT=100] Notification importance slider title -->
<string name="notification_importance_title">Importance</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
<string name="notification_importance_blocked">Blocked: Never show these notifications</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description -->
<string name="notification_importance_low">Low: Silently show at the bottom of the notification list</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description -->
<string name="notification_importance_default">Normal: Silently show these notifications</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
<string name="notification_importance_high">High: Show at the top of the notifications list and make sound</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
<string name="notification_importance_max">Urgent: Peek onto the screen and make sound</string>
<!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
<string name="manage_notification_access_title">Notification access</string>

7
res/xml/app_notification_settings.xml
View File

@@ -30,7 +30,12 @@
<Preference
android:key="app_settings"
android:title="@string/app_notification_preferences"
android:order="5"
android:order="2"
android:persistent="false" />
<PreferenceCategory
android:key="categories"
android:title="@string/notification_topic_categories"
android:order="3" />
</PreferenceScreen>

2
res/xml/topic_notification_settings.xml
View File

@@ -21,7 +21,7 @@
<!-- Importance -->
<com.android.settings.notification.ImportanceSeekBarPreference
android:key="importance"
android:title="@string/app_notification_importance_title"
android:title="@string/notification_importance_title"
android:order="1"
android:persistent="false" />

11
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -28,10 +28,12 @@ import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceCategory;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
@@ -55,6 +57,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
private static final String KEY_BLOCK = "block";
private static final String KEY_APP_SETTINGS = "app_settings";
private static final String KEY_CATEGORIES = "categories";
private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
= new Intent(Intent.ACTION_MAIN)
@@ -64,6 +67,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
private Context mContext;
private SwitchPreference mBlock;
private PreferenceCategory mCategories;
private AppRow mAppRow;
private boolean mCreated;
private boolean mIsSystemPackage;
@@ -136,6 +140,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
// Add topics
List<Notification.Topic> topics = mBackend.getTopics(pkg, mUid);
mCategories = (PreferenceCategory) getPreferenceScreen().findPreference(KEY_CATEGORIES);
for (Notification.Topic topic : topics) {
Preference topicPreference = new Preference(mContext);
topicPreference.setKey(topic.getId());
@@ -151,8 +156,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
TopicNotificationSettings.class.getName(),
topicArgs, null, R.string.topic_notifications_title, null, false);
topicPreference.setIntent(topicIntent);
// Add preference to the settings menu.
getPreferenceScreen().addPreference(topicPreference);
mCategories.addPreference(topicPreference);
}
mBlock.setChecked(mAppRow.banned);
@@ -198,6 +202,9 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
private void updateDependents(boolean banned) {
setVisible(mBlock, !mIsSystemPackage);
if (mCategories != null) {
setVisible(mCategories, !banned);
}
}
private void setVisible(Preference p, boolean visible) {

15
src/com/android/settings/notification/ImportanceSeekBarPreference.java
View File

@@ -90,20 +90,15 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
private String getProgressSummary(int progress) {
switch (progress) {
case NotificationListenerService.Ranking.IMPORTANCE_NONE:
return getContext().getString(
com.android.internal.R.string.notification_importance_blocked);
return getContext().getString(R.string.notification_importance_blocked);
case NotificationListenerService.Ranking.IMPORTANCE_LOW:
return getContext().getString(
com.android.internal.R.string.notification_importance_low);
return getContext().getString(R.string.notification_importance_low);
case NotificationListenerService.Ranking.IMPORTANCE_DEFAULT:
return getContext().getString(
com.android.internal.R.string.notification_importance_default);
return getContext().getString(R.string.notification_importance_default);
case NotificationListenerService.Ranking.IMPORTANCE_HIGH:
return getContext().getString(
com.android.internal.R.string.notification_importance_high);
return getContext().getString(R.string.notification_importance_high);
case NotificationListenerService.Ranking.IMPORTANCE_MAX:
return getContext().getString(
com.android.internal.R.string.notification_importance_max);
return getContext().getString(R.string.notification_importance_max);
default:
return "";
}

2
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -144,7 +144,7 @@ public class NotificationBackend {
return sINM.getTopicImportance(pkg, uid, topic);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
return NotificationListenerService.Ranking.IMPORTANCE_DEFAULT;
return NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
}
}

23
src/com/android/settings/notification/TopicNotificationSettings.java
View File

@@ -21,11 +21,11 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.notification.NotificationBackend.TopicRow;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -59,8 +59,8 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
private SwitchPreference mSensitive;
private TopicRow mTopicRow;
private boolean mCreated;
private boolean mIsSystemPackage;
private int mUid;
private boolean mDndVisualEffectsSuppressed;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
@@ -94,6 +94,10 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
return;
}
NotificationManager.Policy policy =
NotificationManager.from(mContext).getNotificationPolicy();
mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
final Notification.Topic topic = args != null && args.containsKey(ARG_TOPIC)
? (Notification.Topic) args.getParcelable(ARG_TOPIC) : null;
@@ -120,7 +124,6 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
}
final PackageManager pm = getPackageManager();
mIsSystemPackage = Utils.isSystemPackage(pm, info);
addPreferencesFromResource(R.xml.topic_notification_settings);
mImportance = (ImportanceSeekBarPreference) findPreference(KEY_IMPORTANCE);
@@ -140,6 +143,7 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
@Override
public void onImportanceChanged(int progress) {
mBackend.setImportance(mTopicRow.pkg, mTopicRow.uid, mTopicRow.topic, progress);
updateDependents(progress);
}
});
mPriority.setChecked(mTopicRow.priority);
@@ -160,7 +164,7 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
return mBackend.setSensitive(info.packageName, mUid, topic, sensitive);
}
});
updateDependents(mTopicRow.banned);
updateDependents(mTopicRow.importance);
}
@@ -173,16 +177,17 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment {
}
}
private void updateDependents(boolean banned) {
private void updateDependents(int importance) {
final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
UserHandle.myUserId());
final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
setVisible(mPriority, mIsSystemPackage || !banned);
setVisible(mSensitive, mIsSystemPackage || !banned && lockscreenSecure
&& lockscreenNotificationsEnabled && allowPrivate);
setVisible(mImportance, !banned);
setVisible(mPriority, importance > NotificationListenerService.Ranking.IMPORTANCE_DEFAULT
&& !mDndVisualEffectsSuppressed);
setVisible(mSensitive, (importance > NotificationListenerService.Ranking.IMPORTANCE_LOW)
&& lockscreenSecure && lockscreenNotificationsEnabled && allowPrivate);
}
private void setVisible(Preference p, boolean visible) {