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

Settings: Display corp profile calendars in event rule selection.

Browse Source 
And sort the accounts by display name.

Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
This commit is contained in:
John Spurlock
2015-05-20 08:57:01 -04:00
parent 85a72a9088
commit fa76a652e4
2 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen;
@@ -214,12 +215,9 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
private String computeCalendarName(EventInfo event) {
if (event.calendar != EventInfo.ANY_CALENDAR) {
final CalendarInfo[] calendars = ZenModeEventRuleSettings.getCalendars(mContext);
for (int i = 0; i < calendars.length; i++) {
final CalendarInfo calendar = calendars[i];
if (calendar.id == event.calendar) {
return calendar.name;
}
final CalendarInfo calendar = ZenModeEventRuleSettings.findCalendar(mContext, event);
if (calendar != null) {
return calendar.name;
}
}
return getString(R.string.zen_mode_event_rule_summary_any_calendar);