Mostly icon changes.

HypoAlarm/HypoAlarm-HypoAlarm.iml

@@ -72,6 +72,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-19.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-19.0.1" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
   </component>
 </module>
 

HypoAlarm/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion '19.0.1'
 
     defaultConfig {
         minSdkVersion 10
@@ -21,5 +21,7 @@ android {
 dependencies {
     compile 'com.android.support:support-v4:19.0.1'
     compile 'com.android.support:appcompat-v7:19.0.1'
+    compile 'com.nineoldandroids:library:2.4.0'
+    compile fileTree(dir: 'libs', include: ['*.aar'])
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }

HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java

@@ -50,10 +50,10 @@ public class AlarmAlertActivity extends Activity {
             public void run() {
                 // Close the dialogue
                 finish();
-                Log.d("AlarmAlertActivity", "Started notification");
                 // Switch to notification if the Activity has not been closed by the user
                 if (!userCancelled) {
                     startService(new Intent(getApplicationContext(), AlarmNotify.class));
+                    Log.d("AlarmAlertActivity", "Started notification");
                 }
             }
         }, ALERT_LIFE);
@@ -83,6 +83,7 @@ public class AlarmAlertActivity extends Activity {
                 // Close the dialogue (stop vibration &c)
                 finish();
             }
+
         });
     }
 

HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java

@@ -15,7 +15,7 @@ public class CancelGraceReceiver extends BroadcastReceiver {
         Intent graceIntent = new Intent(context, GraceReceiver.class);
         PendingIntent gracePendingIntent = PendingIntent.getBroadcast(context, MainActivity.GRACE_REQUEST, graceIntent, 0);
         graceManager.cancel(gracePendingIntent);
-        Log.d("CancelGraceReceiver", "Cancelled grace alarm.");
+        Log.d("CancelGraceReceiver", "Cancelled grace alarm");
 
         // Display toast
         Toast.makeText(context, context.getString(R.string.alarmCancelToast), Toast.LENGTH_LONG).show();

HypoAlarm/src/main/res/layout/alarm_alert.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".AlarmNotificationActivity">
 
     <ImageView
@@ -34,4 +34,4 @@
         android:layout_below="@+id/cancel_dialog_title"
         android:layout_centerHorizontal="true" />
 
-</RelativeLayout>
+   </RelativeLayout>

HypoAlarm/src/main/res/values/dimens.xml

@@ -3,28 +3,4 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-
-    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
-    <dimen name="glowpadview_target_placement_radius">135dip</dimen>
-
-    <!-- Default glow radius for GlowPadView -->
-    <dimen name="glowpadview_glow_radius">75dip</dimen>
-
-    <!-- Default distance beyond which GlowPadView snaps to the matching target -->
-    <dimen name="glowpadview_snap_margin">40dip</dimen>
-
-    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
-    <dimen name="glowpadview_inner_radius">15dip</dimen>
-
-    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
-
-    <!-- Circle size for incoming call widget's each item. -->
-    <dimen name="incoming_call_widget_circle_size">94dp</dimen>
-
-    <!-- Margin used for incoming call widget's icon for each item.
-    This should be same as "(incoming_call_widget_circle_size - icon_size)/2".
-    Right now answer/decline/reject icons have 38dp width/height.
-    So, (94 - 38)/2 ==> 28dp -->
-    <dimen name="incoming_call_widget_asset_margin">28dp</dimen>
 </resources>