Merge AOSP fixes to unbundled clock branch (982295f9) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmDatabaseHelper.java

+22 −17

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper {

	private static final String DATABASE_NAME = "alarms.db";		private static final String DATABASE_NAME = "alarms.db";
	private static final int DATABASE_VERSION = 5;		private static final int DATABASE_VERSION = 5;
			private static final String TABLE_NAME = "alarms";

	public AlarmDatabaseHelper(Context context) {		public AlarmDatabaseHelper(Context context) {
	super(context, DATABASE_NAME, null, DATABASE_VERSION);		super(context, DATABASE_NAME, null, DATABASE_VERSION);
	@@ -40,21 +41,24 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper {

	@Override		@Override
	public void onCreate(SQLiteDatabase db) {		public void onCreate(SQLiteDatabase db) {
	db.execSQL("CREATE TABLE alarms (" +		db.execSQL("CREATE TABLE " + TABLE_NAME + " (" +
	"_id INTEGER PRIMARY KEY," +		Alarm.Columns._ID + " INTEGER PRIMARY KEY," +
	"hour INTEGER, " +		Alarm.Columns.HOUR + " INTEGER, " +
	"minutes INTEGER, " +		Alarm.Columns.MINUTES + " INTEGER, " +
	"daysofweek INTEGER, " +		Alarm.Columns.DAYS_OF_WEEK + " INTEGER, " +
	"alarmtime INTEGER, " +		Alarm.Columns.ALARM_TIME + " INTEGER, " +
	"enabled INTEGER, " +		Alarm.Columns.ENABLED + " INTEGER, " +
	"vibrate INTEGER, " +		Alarm.Columns.VIBRATE + " INTEGER, " +
	"message TEXT, " +		Alarm.Columns.MESSAGE + " TEXT, " +
	"alert TEXT);");		Alarm.Columns.ALERT + " TEXT);");

	// insert default alarms		// insert default alarms
	String insertMe = "INSERT INTO alarms " +		String cs = ", "; //comma and space
	"(hour, minutes, daysofweek, alarmtime, enabled, vibrate, " +		String insertMe = "INSERT INTO " + TABLE_NAME +
	" message, alert) VALUES ";		" (" + Alarm.Columns.HOUR + cs + Alarm.Columns.MINUTES + cs +
			Alarm.Columns.DAYS_OF_WEEK + cs + Alarm.Columns.ALARM_TIME + cs +
			Alarm.Columns.ENABLED + cs + Alarm.Columns.VIBRATE + cs +
			Alarm.Columns.MESSAGE + cs + Alarm.Columns.ALERT + ") VALUES ";
	db.execSQL(insertMe + "(8, 30, 31, 0, 0, 1, '', '');");		db.execSQL(insertMe + "(8, 30, 31, 0, 0, 1, '', '');");
	db.execSQL(insertMe + "(9, 00, 96, 0, 0, 1, '', '');");		db.execSQL(insertMe + "(9, 00, 96, 0, 0, 1, '', '');");
	}		}
	@@ -66,7 +70,7 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper {
	"Upgrading alarms database from version " +		"Upgrading alarms database from version " +
	oldVersion + " to " + currentVersion +		oldVersion + " to " + currentVersion +
	", which will destroy all old data");		", which will destroy all old data");
	db.execSQL("DROP TABLE IF EXISTS alarms");		db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
	onCreate(db);		onCreate(db);
	}		}

	@@ -81,7 +85,8 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper {
	int id = (Integer) value;		int id = (Integer) value;
	if (id > -1) {		if (id > -1) {
	final Cursor cursor = db		final Cursor cursor = db
	.query("alarms", new String[]{Alarm.Columns._ID}, "_id = ?",		.query(TABLE_NAME, new String[]{Alarm.Columns._ID},
			Alarm.Columns._ID + " = ?",
	new String[]{id + ""}, null, null, null);		new String[]{id + ""}, null, null, null);
	if (cursor.moveToFirst()) {		if (cursor.moveToFirst()) {
	// Record exists. Remove the id so sqlite can generate a new one.		// Record exists. Remove the id so sqlite can generate a new one.
	@@ -90,7 +95,7 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper {
	}		}
	}		}

	rowId = db.insert("alarms", Alarm.Columns.MESSAGE, values);		rowId = db.insert(TABLE_NAME, Alarm.Columns.MESSAGE, values);
	db.setTransactionSuccessful();		db.setTransactionSuccessful();
	} finally {		} finally {
	db.endTransaction();		db.endTransaction();

src/com/android/deskclock/AlarmUtils.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ public class AlarmUtils {
	if (prev != null) {		if (prev != null) {
	ft.remove(prev);		ft.remove(prev);
	}		}
	ft.addToBackStack(null);

	final AlarmTimePickerDialogFragment fragment = AlarmTimePickerDialogFragment.newInstance(		final AlarmTimePickerDialogFragment fragment = AlarmTimePickerDialogFragment.newInstance(
	alarm);		alarm);