Merge "Remove 'peekable' notification preference." (a19090a7) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -6099,12 +6099,6 @@
	<!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->		<!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
	<string name="app_notification_priority_summary">Let this app\u2019s notifications be heard when Do not disturb is set to Priority only</string>		<string name="app_notification_priority_summary">Let this app\u2019s notifications be heard when Do not disturb is set to Priority only</string>

	<!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
	<string name="app_notification_peekable_title">Allow peeking</string>

	<!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
	<string name="app_notification_peekable_summary">Let this app emphasize certain notifications by sliding them briefly into view on the current screen</string>

	<!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->		<!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
	<string name="app_notification_sensitive_title">Hide sensitive content</string>		<string name="app_notification_sensitive_title">Hide sensitive content</string>

	@@ -6494,8 +6488,6 @@
	<string name="notifications_sensitive">Sensitive content hidden</string>		<string name="notifications_sensitive">Sensitive content hidden</string>
	<!-- App notification summary with notifications priority [CHAR LIMIT=40] -->		<!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
	<string name="notifications_priority">Priority</string>		<string name="notifications_priority">Priority</string>
	<!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
	<string name="notifications_no_peeking">No peeking</string>
	<!-- App notification summary with 2 items [CHAR LIMIT=15] -->		<!-- App notification summary with 2 items [CHAR LIMIT=15] -->
	<string name="notifications_two_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g></string>		<string name="notifications_two_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g></string>
	<!-- App notification summary with 3 items [CHAR LIMIT=15] -->		<!-- App notification summary with 3 items [CHAR LIMIT=15] -->
	@@ -6540,8 +6532,6 @@
	<string name="filter_notif_priority_apps">Priority</string>		<string name="filter_notif_priority_apps">Priority</string>
	<!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->		<!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
	<string name="filter_notif_sensitive_apps">Sensitive content hidden</string>		<string name="filter_notif_sensitive_apps">Sensitive content hidden</string>
	<!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
	<string name="filter_notif_no_peeking">No peeking</string>
	<!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->		<!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
	<string name="filter_with_domain_urls_apps">With domain URLs</string>		<string name="filter_with_domain_urls_apps">With domain URLs</string>

res/xml/app_notification_settings.xml

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -34,14 +34,6 @@
	android:order="2"		android:order="2"
	android:persistent="false" />		android:persistent="false" />

	<!-- Peekable -->
	<SwitchPreference
	android:key="peekable"
	android:title="@string/app_notification_peekable_title"
	android:summary="@string/app_notification_peekable_summary"
	android:order="3"
	android:persistent="false" />

	<!-- Sensitive -->		<!-- Sensitive -->
	<SwitchPreference		<SwitchPreference
	android:key="sensitive"		android:key="sensitive"

src/com/android/settings/applications/AppStateNotificationBridge.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -88,15 +88,4 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
	return info.extraInfo != null && ((AppRow) info.extraInfo).sensitive;		return info.extraInfo != null && ((AppRow) info.extraInfo).sensitive;
	}		}
	};		};

	public static final AppFilter FILTER_APP_NOTIFICATION_NO_PEEK = new AppFilter() {
	@Override
	public void init() {
	}

	@Override
	public boolean filterApp(AppEntry info) {
	return info.extraInfo != null && !((AppRow) info.extraInfo).peekable;
	}
	};
	}		}

src/com/android/settings/applications/InstalledAppDetails.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -821,9 +821,6 @@ public class InstalledAppDetails extends AppInfoBase
	if (appRow.sensitive) {		if (appRow.sensitive) {
	notifSummary.add(context.getString(R.string.notifications_sensitive));		notifSummary.add(context.getString(R.string.notifications_sensitive));
	}		}
	if (!appRow.peekable) {
	notifSummary.add(context.getString(R.string.notifications_no_peeking));
	}
	switch (notifSummary.size()) {		switch (notifSummary.size()) {
	case 3:		case 3:
	return context.getString(R.string.notifications_three_items,		return context.getString(R.string.notifications_three_items,

src/com/android/settings/applications/ManageApplications.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,6 @@ public class ManageApplications extends InstrumentedFragment
	R.string.filter_apps_disabled, // Disabled		R.string.filter_apps_disabled, // Disabled
	R.string.filter_notif_blocked_apps, // Blocked Notifications		R.string.filter_notif_blocked_apps, // Blocked Notifications
	R.string.filter_notif_priority_apps, // Priority Notifications		R.string.filter_notif_priority_apps, // Priority Notifications
	R.string.filter_notif_no_peeking, // No peeking Notifications
	R.string.filter_notif_sensitive_apps, // Sensitive Notifications		R.string.filter_notif_sensitive_apps, // Sensitive Notifications
	R.string.filter_personal_apps, // Personal		R.string.filter_personal_apps, // Personal
	R.string.filter_work_apps, // Work		R.string.filter_work_apps, // Work
	@@ -160,7 +159,6 @@ public class ManageApplications extends InstrumentedFragment
	ApplicationsState.FILTER_DISABLED, // Disabled		ApplicationsState.FILTER_DISABLED, // Disabled
	AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED, // Blocked Notifications		AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED, // Blocked Notifications
	AppStateNotificationBridge.FILTER_APP_NOTIFICATION_PRIORITY, // Priority Notifications		AppStateNotificationBridge.FILTER_APP_NOTIFICATION_PRIORITY, // Priority Notifications
	AppStateNotificationBridge.FILTER_APP_NOTIFICATION_NO_PEEK, // No peeking Notifications
	AppStateNotificationBridge.FILTER_APP_NOTIFICATION_SENSITIVE, // Sensitive Notifications		AppStateNotificationBridge.FILTER_APP_NOTIFICATION_SENSITIVE, // Sensitive Notifications
	ApplicationsState.FILTER_PERSONAL, // Personal		ApplicationsState.FILTER_PERSONAL, // Personal
	ApplicationsState.FILTER_WORK, // Work		ApplicationsState.FILTER_WORK, // Work