Merge "Set new PBAP connections to always allow." into lmp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d11022..8fbccba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5797,7 +5797,7 @@
<string name="zen_mode_from_starred">Starred contacts only</string>
<!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
- <string name="zen_mode_alarm_info">Alarms and other personal reminders are priority interruptions</string>
+ <string name="zen_mode_alarm_info">Alarms and other personal reminders are always priority</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index a4084cb..aea4291 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -43,6 +43,11 @@
android:switchTextOff=""
android:switchTextOn="" />
+ <com.android.settings.notification.DropDownPreference
+ android:key="starred"
+ android:title="@string/zen_mode_from"
+ android:persistent="false" />
+
<Preference
android:key="alarm_info"
android:title=""
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index c20b350..5e24b9d 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -153,8 +153,6 @@
final PreferenceCategory important =
(PreferenceCategory) root.findPreference(KEY_IMPORTANT);
- final Preference alarmInfo = important.findPreference(KEY_ALARM_INFO);
- important.removePreference(alarmInfo);
mCalls = (SwitchPreference) important.findPreference(KEY_CALLS);
if (Utils.isVoiceCapable(mContext)) {
@@ -189,9 +187,7 @@
}
});
- mStarred = new DropDownPreference(mContext);
- mStarred.setKey(KEY_STARRED);
- mStarred.setTitle(R.string.zen_mode_from);
+ mStarred = (DropDownPreference) important.findPreference(KEY_STARRED);
mStarred.setDropDownWidth(R.dimen.zen_mode_dropdown_width);
mStarred.addItem(R.string.zen_mode_from_anyone, ZenModeConfig.SOURCE_ANYONE);
mStarred.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR);
@@ -211,8 +207,6 @@
});
important.addPreference(mStarred);
- important.addPreference(alarmInfo);
-
final PreferenceCategory downtime = (PreferenceCategory) root.findPreference(KEY_DOWNTIME);
mDays = downtime.findPreference(KEY_DAYS);