Auto-update

google-automerger · google-automerger · commit 407685187942 · 2016-06-15T09:41:55.000-07:00
diff --git a/Application/build.gradle b/Application/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 
diff --git a/Application/src/main/AndroidManifest.xml b/Application/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
-        android:theme="@style/Theme.AppCompat.Light"
+        android:theme="@style/AppTheme"
         >
 
         <activity
diff --git a/Application/src/main/java/com/example/android/directboot/alarms/AlarmIntentService.java b/Application/src/main/java/com/example/android/directboot/alarms/AlarmIntentService.java
@@ -23,7 +23,6 @@
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.LocalBroadcastManager;
@@ -44,15 +43,7 @@ public AlarmIntentService() {
     @Override
     protected void onHandleIntent(Intent intent) {
         Context context = getApplicationContext();
-        // TODO: For some reasons, parcelable serialization started to fail in IntentService
-        //       Retrieving primitives from the intent as a workaround
-        Alarm alarm = new Alarm();
-        Bundle bundle = intent.getExtras();
-        alarm.id = bundle.getInt("id");
-        alarm.minute = bundle.getInt("minute");
-        alarm.hour = bundle.getInt("hour");
-        alarm.date = bundle.getInt("date");
-        alarm.month = bundle.getInt("month");
+        Alarm alarm = intent.getParcelableExtra(ALARM_KEY);
 
         NotificationManager notificationManager = context
                 .getSystemService(NotificationManager.class);
diff --git a/Application/src/main/java/com/example/android/directboot/alarms/AlarmUtil.java b/Application/src/main/java/com/example/android/directboot/alarms/AlarmUtil.java
@@ -45,13 +45,7 @@ public AlarmUtil(Context context) {
      */
     public void scheduleAlarm(Alarm alarm) {
         Intent intent = new Intent(mContext, AlarmIntentService.class);
-        // TODO: For some reasons, a parcelable serialization started to fail in IntentService
-        //       As a workaround, putting primitives in the intent
-        intent.putExtra("id", alarm.id);
-        intent.putExtra("minute", alarm.minute);
-        intent.putExtra("hour", alarm.hour);
-        intent.putExtra("date", alarm.date);
-        intent.putExtra("month", alarm.month);
+        intent.putExtra(AlarmIntentService.ALARM_KEY, alarm);
         PendingIntent pendingIntent = PendingIntent
                 .getService(mContext, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         Calendar alarmTime = Calendar.getInstance();
@@ -67,7 +61,7 @@ public void scheduleAlarm(Alarm alarm) {
         Log.i(TAG,
                 String.format("Alarm scheduled at (%2d:%02d) Date: %d, Month: %d",
                         alarm.hour, alarm.minute,
-                        alarm.date, alarm.month));
+                        alarm.month, alarm.date));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.1.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.0.0'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`android:allowBackup="true"`
`26`	`26`	`android:label="@string/app_name"`
`27`	`27`	`android:icon="@mipmap/ic_launcher"`
`28`		`- android:theme="@style/Theme.AppCompat.Light"`
	`28`	`+ android:theme="@style/AppTheme"`
`29`	`29`	`>`
`30`	`30`
`31`	`31`	`<activity`