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

Remove "don't show" option from work notifications settings

Browse Source 
Option to not show notifications is still available for
device-wide locks screen notification settings.

Also s/On lock screen/When work profile is locked/ for work
notifications since it applies not only to lock screen but to
notification shade as well.

Bug: 64829587
Test: make RunSettingsRoboTests
Change-Id: Ie3ec461f4c8887a5a49cd92b5350ea683f701027
This commit is contained in:
Pavel Grafov
2017-09-11 15:46:46 +01:00
parent 7ac7d7b660
commit 72137f3aad
5 changed files with 45 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,12 +119,12 @@ public class RedactionInterstitial extends SettingsActivity {
getContext(), getActivity().getIntent().getExtras());
if (UserManager.get(getContext()).isManagedProfile(mUserId)) {
((TextView) view.findViewById(R.id.message))
.setText(R.string.lock_screen_notifications_interstitial_message_profile);
.setText(R.string.lock_screen_notifications_interstitial_message_profile);
mShowAllButton.setText(R.string.lock_screen_notifications_summary_show_profile);
mRedactSensitiveButton
.setText(R.string.lock_screen_notifications_summary_hide_profile);
((RadioButton) view.findViewById(R.id.hide_all))
.setText(R.string.lock_screen_notifications_summary_disable_profile);
.setText(R.string.lock_screen_notifications_summary_hide_profile);
((RadioButton) view.findViewById(R.id.hide_all)).setVisibility(View.GONE);
}
final Button button = (Button) view.findViewById(R.id.redaction_done_button);
@@ -164,10 +164,11 @@ public class RedactionInterstitial extends SettingsActivity {
}
private void loadFromSettings() {
final boolean enabled = Settings.Secure.getIntForUser(getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, mUserId) != 0;
final boolean managed = UserManager.get(getContext()).isManagedProfile(mUserId);
final boolean enabled = !managed || Settings.Secure.getIntForUser(getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, mUserId) != 0;
final boolean show = Settings.Secure.getIntForUser(getContentResolver(),
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 1, mUserId) != 0;
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 1, mUserId) != 0;
int checkedButtonId = R.id.hide_all;
if (enabled) {