diff options
| author | James Lemieux <jplemieux@google.com> | 2017-01-31 01:43:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-31 01:43:47 +0000 |
| commit | eddc4a8aac81b37d5137910664e2e9c832dd43d1 (patch) | |
| tree | 0f921c9605fcbd2422eca831a6629e87e6e51a63 /src | |
| parent | 5d943475d92066fb1f32ae754e7f6310f604712a (diff) | |
| parent | 2ce91e244f72c245dd31b06a2156d89828a41ed6 (diff) | |
| download | android_packages_apps_DeskClock-eddc4a8aac81b37d5137910664e2e9c832dd43d1.tar.gz android_packages_apps_DeskClock-eddc4a8aac81b37d5137910664e2e9c832dd43d1.tar.bz2 android_packages_apps_DeskClock-eddc4a8aac81b37d5137910664e2e9c832dd43d1.zip | |
Merge "Avoid exceptions while launching ringtone picker from non-Activity" into ub-deskclock-huddle
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/deskclock/alarms/AlarmTimeClickHandler.java | 6 | ||||
| -rw-r--r-- | src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java index 891f2f59d..6c9464946 100644 --- a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java +++ b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java @@ -169,13 +169,13 @@ public final class AlarmTimeClickHandler { mAlarmUpdateHandler.showPredismissToast(alarmInstance); } - public void onRingtoneClicked(Alarm alarm) { + public void onRingtoneClicked(Context context, Alarm alarm) { mSelectedAlarm = alarm; Events.sendAlarmEvent(R.string.action_set_ringtone, R.string.label_deskclock); final Intent intent = - RingtonePickerActivity.createAlarmRingtonePickerIntent(mContext, alarm); - mContext.startActivity(intent); + RingtonePickerActivity.createAlarmRingtonePickerIntent(context, alarm); + context.startActivity(intent); } public void onEditLabelClicked(Alarm alarm) { diff --git a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java index a510d8626..21647c26a 100644 --- a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java +++ b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java @@ -152,7 +152,7 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder { ringtone.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - getAlarmTimeClickHandler().onRingtoneClicked(getItemHolder().item); + getAlarmTimeClickHandler().onRingtoneClicked(context, getItemHolder().item); } }); // Delete alarm handler |