summaryrefslogtreecommitdiff
path: root/src/com/android/deskclock/provider/AlarmInstance.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/deskclock/provider/AlarmInstance.java')
-rw-r--r--src/com/android/deskclock/provider/AlarmInstance.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/deskclock/provider/AlarmInstance.java b/src/com/android/deskclock/provider/AlarmInstance.java
index 9fb7a7b07..a7502b740 100644
--- a/src/com/android/deskclock/provider/AlarmInstance.java
+++ b/src/com/android/deskclock/provider/AlarmInstance.java
@@ -33,6 +33,7 @@ import com.android.deskclock.data.DataModel;
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
+import java.util.UUID;
public final class AlarmInstance implements ClockContract.InstancesColumns {
/**
@@ -66,7 +67,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
VIBRATE,
RINGTONE,
ALARM_ID,
- ALARM_STATE
+ ALARM_STATE,
+ INCREASING_VOLUME
};
/**
@@ -84,8 +86,9 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
private static final int RINGTONE_INDEX = 8;
private static final int ALARM_ID_INDEX = 9;
private static final int ALARM_STATE_INDEX = 10;
+ private static final int INCREASING_VOLUME_INDEX = 11;
- private static final int COLUMN_COUNT = ALARM_STATE_INDEX + 1;
+ private static final int COLUMN_COUNT = INCREASING_VOLUME_INDEX + 1;
public static ContentValues createContentValues(AlarmInstance instance) {
ContentValues values = new ContentValues(COLUMN_COUNT);
@@ -109,6 +112,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
}
values.put(ALARM_ID, instance.mAlarmId);
values.put(ALARM_STATE, instance.mAlarmState);
+ values.put(INCREASING_VOLUME, instance.mIncreasingVolume ? 1 : 0);
+
return values;
}
@@ -295,6 +300,7 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
public Uri mRingtone;
public Long mAlarmId;
public int mAlarmState;
+ public boolean mIncreasingVolume;
public AlarmInstance(Calendar calendar, Long alarmId) {
this(calendar);
@@ -308,6 +314,7 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
mVibrate = false;
mRingtone = null;
mAlarmState = SILENT_STATE;
+ mIncreasingVolume = false;
}
public AlarmInstance(AlarmInstance instance) {
@@ -322,6 +329,7 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
this.mRingtone = instance.mRingtone;
this.mAlarmId = instance.mAlarmId;
this.mAlarmState = instance.mAlarmState;
+ this.mIncreasingVolume = instance.mIncreasingVolume;
}
public AlarmInstance(Cursor c, boolean joinedTable) {
@@ -356,6 +364,7 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
mAlarmId = c.getLong(ALARM_ID_INDEX);
}
mAlarmState = c.getInt(ALARM_STATE_INDEX);
+ mIncreasingVolume = c.getInt(INCREASING_VOLUME_INDEX) == 1;
}
/**
@@ -471,6 +480,7 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
", mRingtone=" + mRingtone +
", mAlarmId=" + mAlarmId +
", mAlarmState=" + mAlarmState +
+ ", mIncreasingVolume=" + mIncreasingVolume +
'}';
}
}