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

Merge "Reorder "on the lock screen" options." into oc-mr1-dev

Browse Source 
am: 40b8d3d238

Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1
This commit is contained in:
Alison Cichowlas
2017-09-06 21:23:52 +00:00
committed by android-build-merger
parent 08c4871dbe 40b8d3d238
commit 22fc09757e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
View File

@@ -109,8 +109,6 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
private void initLockScreenNotificationPrefDisplay() { private void initLockScreenNotificationPrefDisplay() {
ArrayList<CharSequence> entries = new ArrayList<>(); ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>(); ArrayList<CharSequence> values = new ArrayList<>();
entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable));
values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
String summaryShowEntry = String summaryShowEntry =
mContext.getString(R.string.lock_screen_notifications_summary_show); mContext.getString(R.string.lock_screen_notifications_summary_show);
@@ -132,6 +130,10 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS); KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
} }
entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable));
values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()])); mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()])); mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
updateLockscreenNotifications(); updateLockscreenNotifications();
@@ -151,8 +153,6 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
} }
ArrayList<CharSequence> entries = new ArrayList<>(); ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>(); ArrayList<CharSequence> values = new ArrayList<>();
entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable_profile));
values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable_profile));
String summaryShowEntry = mContext.getString( String summaryShowEntry = mContext.getString(
R.string.lock_screen_notifications_summary_show_profile); R.string.lock_screen_notifications_summary_show_profile);
@@ -173,6 +173,10 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
setRestrictedIfNotificationFeaturesDisabled(summaryHideEntry, summaryHideEntryValue, setRestrictedIfNotificationFeaturesDisabled(summaryHideEntry, summaryHideEntryValue,
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS); KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
} }
entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable_profile));
values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable_profile));
mLockscreenProfile.setOnPreClickListener( mLockscreenProfile.setOnPreClickListener(
(Preference p) -> Utils.startQuietModeDialogIfNecessary(mContext, (Preference p) -> Utils.startQuietModeDialogIfNecessary(mContext,
UserManager.get(mContext), mProfileChallengeUserId) UserManager.get(mContext), mProfileChallengeUserId)