diff options
| author | John Spurlock <jspurlock@google.com> | 2015-03-17 19:47:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-17 19:47:14 +0000 |
| commit | e8de915a8e26cf44f41afaf1023a24c30d970195 (patch) | |
| tree | c699754dd582d0e707727b33f0413fe47cb222df | |
| parent | 3b5c945aa720e025e9875336a7093d25830a2172 (diff) | |
| parent | cfe4aedc47c513be8b1a9168f5dcfc9017e52a97 (diff) | |
| download | packages_apps_Settings-e8de915a8e26cf44f41afaf1023a24c30d970195.tar.gz packages_apps_Settings-e8de915a8e26cf44f41afaf1023a24c30d970195.tar.bz2 packages_apps_Settings-e8de915a8e26cf44f41afaf1023a24c30d970195.zip | |
Merge "Settings: Add a 'Cast' entry point under Sound & notification."
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/notification_settings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/notification/NotificationSettings.java | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 95a00a830..a20b57110 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5599,7 +5599,7 @@ <string name="keywords_display_night_mode">dark theme night mode dim screen invert brightness</string> <string name="keywords_display_wallpaper">background personalize customize display</string> <string name="keywords_display_font_size">text size</string> - <string name="keywords_display_cast_screen">project</string> + <string name="keywords_display_cast_screen">project cast</string> <string name="keywords_storage">space disk hard drive device usage</string> <string name="keywords_battery">power usage charge</string> <string name="keywords_spell_checker">spelling dictionary spellcheck auto-correct</string> diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml index e5dda1908..6e62f83f3 100644 --- a/res/xml/notification_settings.xml +++ b/res/xml/notification_settings.xml @@ -84,6 +84,12 @@ android:persistent="false" android:fragment="com.android.settings.notification.OtherSoundSettings" /> + <!-- Cast --> + <PreferenceScreen + android:key="wifi_display" + android:title="@string/wifi_display_settings_title" + android:fragment="com.android.settings.wfd.WifiDisplaySettings" /> + </PreferenceCategory> <PreferenceCategory diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java index b3924842e..41ae0aba1 100644 --- a/src/com/android/settings/notification/NotificationSettings.java +++ b/src/com/android/settings/notification/NotificationSettings.java @@ -71,6 +71,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements private static final String KEY_PHONE_RINGTONE = "ringtone"; private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone"; private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing"; + private static final String KEY_WIFI_DISPLAY = "wifi_display"; private static final String KEY_NOTIFICATION = "notification"; private static final String KEY_NOTIFICATION_PULSE = "notification_pulse"; private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications"; @@ -601,6 +602,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements } else { rt.add(KEY_RING_VOLUME); rt.add(KEY_PHONE_RINGTONE); + rt.add(KEY_WIFI_DISPLAY); rt.add(KEY_VIBRATE_WHEN_RINGING); } return rt; |