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

Add default alarm ringtone to sound settings.

Browse Source 
Bug: 25957833
Change-Id: I68d6747894665c97853eabac7edb0f751d1fdcc1
This commit is contained in:
Julia Reynolds
2016-01-20 11:10:49 -05:00
parent befdce36fd
commit 193e7b044d
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -5624,6 +5624,9 @@
<!-- Sound: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] --> <!-- Sound: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
<string name="notification_ringtone_title">Default notification ringtone</string> <string name="notification_ringtone_title">Default notification ringtone</string>
<!-- Sound: Title for the option defining the default alarm ringtone. [CHAR LIMIT=30] -->
<string name="alarm_ringtone_title">Default alarm ringtone</string>
<!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] --> <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
<string name="vibrate_when_ringing_title">Also vibrate for calls</string> <string name="vibrate_when_ringing_title">Also vibrate for calls</string>

8
res/xml/sound_settings.xml
View File

@@ -81,6 +81,14 @@
android:persistent="false" android:persistent="false"
android:ringtoneType="notification" /> android:ringtoneType="notification" />
<!-- Default alarm ringtone -->
<com.android.settings.DefaultRingtonePreference
android:key="alarm_ringtone"
android:title="@string/alarm_ringtone_title"
android:dialogTitle="@string/alarm_ringtone_title"
android:persistent="false"
android:ringtoneType="alarm" />
<PreferenceScreen <PreferenceScreen
android:key="cell_broadcast_settings" android:key="cell_broadcast_settings"
android:title="@string/cell_broadcast_settings" > android:title="@string/cell_broadcast_settings" >

14
src/com/android/settings/notification/SoundSettings.java
View File

@@ -73,6 +73,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
private static final String KEY_NOTIFICATION_VOLUME = "notification_volume"; private static final String KEY_NOTIFICATION_VOLUME = "notification_volume";
private static final String KEY_PHONE_RINGTONE = "ringtone"; private static final String KEY_PHONE_RINGTONE = "ringtone";
private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone"; private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone";
private static final String KEY_ALARM_RINGTONE = "alarm_ringtone";
private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing"; private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
private static final String KEY_MASTER_MONO = "master_mono"; private static final String KEY_MASTER_MONO = "master_mono";
private static final String KEY_WIFI_DISPLAY = "wifi_display"; private static final String KEY_WIFI_DISPLAY = "wifi_display";
@@ -103,6 +104,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
private Preference mPhoneRingtonePreference; private Preference mPhoneRingtonePreference;
private Preference mNotificationRingtonePreference; private Preference mNotificationRingtonePreference;
private Preference mAlarmRingtonePreference;
private TwoStatePreference mVibrateWhenRinging; private TwoStatePreference mVibrateWhenRinging;
private TwoStatePreference mMasterMono; private TwoStatePreference mMasterMono;
private ComponentName mSuppressor; private ComponentName mSuppressor;
@@ -324,6 +326,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
} }
mNotificationRingtonePreference = mNotificationRingtonePreference =
getPreferenceScreen().findPreference(KEY_NOTIFICATION_RINGTONE); getPreferenceScreen().findPreference(KEY_NOTIFICATION_RINGTONE);
mAlarmRingtonePreference = getPreferenceScreen().findPreference(KEY_ALARM_RINGTONE);
} }
private void lookupRingtoneNames() { private void lookupRingtoneNames() {
@@ -347,6 +350,13 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
mHandler.obtainMessage(H.UPDATE_NOTIFICATION_RINGTONE, summary).sendToTarget(); mHandler.obtainMessage(H.UPDATE_NOTIFICATION_RINGTONE, summary).sendToTarget();
} }
} }
if (mAlarmRingtonePreference != null) {
final CharSequence summary =
updateRingtoneName(mContext, RingtoneManager.TYPE_ALARM);
if (summary != null) {
mHandler.obtainMessage(H.UPDATE_ALARM_RINGTONE, summary).sendToTarget();
}
}
} }
}; };
@@ -484,6 +494,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
private static final int UPDATE_EFFECTS_SUPPRESSOR = 4; private static final int UPDATE_EFFECTS_SUPPRESSOR = 4;
private static final int UPDATE_RINGER_MODE = 5; private static final int UPDATE_RINGER_MODE = 5;
private static final int UPDATE_MASTER_MONO = 6; private static final int UPDATE_MASTER_MONO = 6;
private static final int UPDATE_ALARM_RINGTONE = 7;
private H() { private H() {
super(Looper.getMainLooper()); super(Looper.getMainLooper());
@@ -510,6 +521,9 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
case UPDATE_MASTER_MONO: case UPDATE_MASTER_MONO:
updateMasterMono(); updateMasterMono();
break; break;
case UPDATE_ALARM_RINGTONE:
mAlarmRingtonePreference.setSummary((CharSequence) msg.obj);
break;
} }
} }
} }