am 9722dd0b: Make on/off switch more visible (9c380bf4) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmClock.java

+17 −11

Original line number	Diff line number	Diff line
		@@ -465,6 +465,7 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		CheckBox vibrate;
		ViewGroup collapse;
		TextView ringtone;
		View hairLine;

		// Other states
		Alarm alarm;
		@@ -574,6 +575,7 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		holder.infoArea = view.findViewById(R.id.info_area);
		holder.repeat = (CheckBox) view.findViewById(R.id.repeat_onoff);
		holder.clickableLabel = (TextView) view.findViewById(R.id.edit_label);
		holder.hairLine = view.findViewById(R.id.hairline);
		holder.repeatDays = (LinearLayout) view.findViewById(R.id.repeat_days);

		// Build button for each day.
		@@ -610,14 +612,12 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		itemHolder.onoff.setChecked(alarm.enabled);
		if (mSelectedAlarms.contains(itemHolder.alarm.id)) {
		itemHolder.alarmItem.setBackgroundColor(mBackgroundColorSelected);
		itemHolder.alarmItem.setAlpha(1f);
		setItemAlpha(itemHolder, true);
		itemHolder.onoff.setEnabled(false);
		} else {
		itemHolder.onoff.setEnabled(true);
		itemHolder.alarmItem.setBackgroundColor(mBackgroundColor);
		if (itemHolder.onoff.isChecked()) {
		itemHolder.alarmItem.setAlpha(1f);
		} else {
		itemHolder.alarmItem.setAlpha(0.5f);
		}
		setItemAlpha(itemHolder, itemHolder.onoff.isChecked());
		}
		final CompoundButton.OnCheckedChangeListener onOffListener =
		new CompoundButton.OnCheckedChangeListener() {
		@@ -629,11 +629,7 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		return;
		}
		if (checked != alarm.enabled) {
		if (checked) {
		itemHolder.alarmItem.setAlpha(1f);
		} else {
		itemHolder.alarmItem.setAlpha(0.5f);
		}
		setItemAlpha(itemHolder, checked);
		alarm.enabled = checked;
		asyncUpdateAlarm(alarm, alarm.enabled);
		}
		@@ -912,6 +908,16 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		itemHolder.ringtone.setOnLongClickListener(mLongClickListener);
		}

		// Sets the alpha of the item except the on/off switch. This gives a visual effect
		// for enabled/disabled alarm while leaving the on/off switch more visible
		private void setItemAlpha(ItemHolder holder, boolean enabled) {
		float alpha = enabled ? 1f : 0.5f;
		holder.clock.setAlpha(alpha);
		holder.infoArea.setAlpha(alpha);
		holder.expandArea.setAlpha(alpha);
		holder.hairLine.setAlpha(alpha);
		}

		private void updateDaysOfWeekButtons(ItemHolder holder, Alarm.DaysOfWeek daysOfWeek) {
		HashSet<Integer> setDays = daysOfWeek.getSetDays();
		for (int i = 0; i < 7; i++) {