Merge "Provide accessibility feedback on alarm dismissed/snoozed" into lmp-mr1-dev (a3e4a540) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/alarms/AlarmActivity.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -356,8 +356,15 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie

		final int alertColor = getResources().getColor(R.color.hot_pink);
		setAnimatedFractions(1.0f /* snoozeFraction /, 0.0f / dismissFraction */);
		getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text,
		AlarmStateManager.getSnoozedMinutes(this), alertColor, alertColor).start();

		final int snoozeMinutes = AlarmStateManager.getSnoozedMinutes(this);
		final String infoText = getResources().getQuantityString(
		R.plurals.alarm_alert_snooze_duration, snoozeMinutes, snoozeMinutes);
		final String accessibilityText = getResources().getQuantityString(
		R.plurals.alarm_alert_snooze_set, snoozeMinutes, snoozeMinutes);

		getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, infoText,
		accessibilityText, alertColor, alertColor).start();
		AlarmStateManager.setSnoozeState(this, mAlarmInstance, false /* showToast */);
		}

		@@ -367,6 +374,7 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie

		setAnimatedFractions(0.0f /* snoozeFraction /, 1.0f / dismissFraction */);
		getAlertAnimator(mDismissButton, R.string.alarm_alert_off_text, null /* infoText */,
		getString(R.string.alarm_alert_off_text) /* accessibilityText */,
		Color.WHITE, mCurrentHourColor).start();
		AlarmStateManager.setDismissState(this, mAlarmInstance);
		}
		@@ -412,7 +420,8 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie
		}

		private Animator getAlertAnimator(final View source, final int titleResId,
		final String infoText, final int revealColor, final int backgroundColor) {
		final String infoText, final String accessibilityText, final int revealColor,
		final int backgroundColor) {
		final ViewGroupOverlay overlay = mContainerView.getOverlay();

		// Create a transient view for performing the reveal animation.
		@@ -453,10 +462,12 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie
		public void onAnimationEnd(Animator animator) {
		mAlertView.setVisibility(View.VISIBLE);
		mAlertTitleView.setText(titleResId);

		if (infoText != null) {
		mAlertInfoView.setText(infoText);
		mAlertInfoView.setVisibility(View.VISIBLE);
		}
		mAlertView.announceForAccessibility(accessibilityText);
		mContentView.setVisibility(View.GONE);
		mContainerView.setBackgroundColor(backgroundColor);
		}

src/com/android/deskclock/alarms/AlarmStateManager.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -416,12 +416,10 @@ public final class AlarmStateManager extends BroadcastReceiver {

		}

		public static String getSnoozedMinutes(Context context) {
		public static int getSnoozedMinutes(Context context) {
		final String snoozeMinutesStr = PreferenceManager.getDefaultSharedPreferences(context)
		.getString(SettingsActivity.KEY_ALARM_SNOOZE, DEFAULT_SNOOZE_MINUTES);
		final int snoozeMinutes = Integer.parseInt(snoozeMinutesStr);
		return context.getResources().getQuantityString(R.plurals.alarm_alert_snooze_duration,
		snoozeMinutes, snoozeMinutes);
		return Integer.parseInt(snoozeMinutesStr);
		}

		/**