Merge branch 'Team-Android' of github.com:RH-CSSE-371-F2013/Section04…

… into Team-Android

Conflicts:
	DroidRage/res/layout/activity_edit_group.xml
	DroidRage/src/com/meetingninja/csse/group/EditGroupActivity.java
	DroidRage/src/com/meetingninja/csse/group/GroupsFragment.java
	DroidRage/src/com/meetingninja/csse/meetings/MeetingItemAdapter.java
	DroidRage/src/com/meetingninja/csse/tasks/EditTaskActivity.java

DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java

@@ -44,6 +44,7 @@
 import android.widget.TextView;
 
 import com.doomonafireball.betterpickers.Utils;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**

DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/SimpleMonthView.java

@@ -45,6 +45,7 @@
 import com.doomonafireball.betterpickers.TouchExplorationHelper;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.calendardatepicker.SimpleMonthAdapter.CalendarDay;
+import com.meetingninja.csse.R;
 
 /**
  * A calendar-like view displaying a specified month and the appropriate

DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/TextViewWithCircularIndicator.java

@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.calendardatepicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;

DroidRage/externalSrc/com/doomonafireball/betterpickers/calendardatepicker/YearPickerView.java

@@ -32,6 +32,7 @@
 import android.widget.TextView;
 
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog.OnDateChangedListener;
+import com.meetingninja.csse.R;
 
 /**
  * Displays a selectable list of years.

DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPicker.java

@@ -1,5 +1,7 @@
 package com.doomonafireball.betterpickers.hmspicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;

DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java

@@ -2,6 +2,8 @@
 
 import java.util.Vector;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;

DroidRage/externalSrc/com/doomonafireball/betterpickers/hmspicker/HmsView.java

@@ -8,6 +8,7 @@
 import android.widget.LinearLayout;
 
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class HmsView extends LinearLayout {
 

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/AmPmCirclesView.java

@@ -18,6 +18,8 @@
 
 import java.text.DateFormatSymbols;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/CircleView.java

@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.radialtimepicker;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java

@@ -38,6 +38,7 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.view.ViewHelper;

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java

@@ -23,6 +23,7 @@
 import android.util.Log;
 import android.view.View;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java

@@ -25,6 +25,7 @@
 import android.util.Log;
 import android.view.View;
 
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.Keyframe;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.animation.PropertyValuesHolder;

DroidRage/externalSrc/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java

@@ -39,6 +39,7 @@
 
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialPickerLayout.OnValueSelectedListener;
+import com.meetingninja.csse.R;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**

DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePicker.java

@@ -2,6 +2,8 @@
 
 import java.text.DateFormatSymbols;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;

DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java

@@ -2,6 +2,8 @@
 
 import java.util.Vector;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;

DroidRage/externalSrc/com/doomonafireball/betterpickers/timepicker/TimerView.java

@@ -9,6 +9,7 @@
 import android.widget.LinearLayout;
 
 import com.doomonafireball.betterpickers.widget.ZeroTopPaddingTextView;
+import com.meetingninja.csse.R;
 
 public class TimerView extends LinearLayout {
 

DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/UnderlinePageIndicatorPicker.java

@@ -15,6 +15,8 @@
  */
 package com.doomonafireball.betterpickers.widget;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;

DroidRage/externalSrc/com/doomonafireball/betterpickers/widget/ZeroTopPaddingTextView.java

@@ -16,6 +16,8 @@
 
 package com.doomonafireball.betterpickers.widget;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Build;

DroidRage/externalSrc/pl/polidea/treeview/AbstractTreeViewAdapter.java

@@ -1,5 +1,7 @@
 package pl.polidea.treeview;
 
+import com.meetingninja.csse.R;
+
 import android.app.Activity;
 import android.content.Context;
 import android.database.DataSetObserver;

DroidRage/externalSrc/pl/polidea/treeview/TreeViewList.java

@@ -1,5 +1,7 @@
 package pl.polidea.treeview;
 
+import com.meetingninja.csse.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;

DroidRage/project.properties

@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-19
+android.library.reference.1=../../android-support-v7-appcompat

DroidRage/res/layout/activity_edit_group.xml

@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/group_edit_main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -17,13 +18,16 @@
         android:enabled="true"
         android:gravity="center"
         android:hint="@string/group_name"
+        android:inputType="text"
+        android:paddingBottom="@dimen/activity_vertical_margin"
         android:textSize="25sp" />
 
     <Button
         android:id="@+id/group_add_member"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:hint="+ Add a member"
         android:minHeight="28dp"
         android:onClick="addMember"

DroidRage/res/layout/activity_login.xml

@@ -95,15 +95,19 @@
 
                 <Button
                     android:id="@+id/sign_in_button"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_column="0"
                     android:layout_gravity="left"
                     android:layout_row="1"
+                    android:background="@android:drawable/btn_default_small"
                     android:text="@string/action_sign_in" />
 
                 <Button
                     android:id="@+id/register_button"
+                    style="?android:attr/buttonStyleSmall"
+					android:background="@android:drawable/btn_default_small"
                     android:layout_width="wrap_content"
                     android:layout_gravity="fill_horizontal"
                     android:layout_marginTop="@dimen/activity_horizontal_margin"

DroidRage/res/layout/activity_register.xml

@@ -67,6 +67,8 @@
 
         <Button
             android:id="@+id/register_action_button"
+            style="?android:attr/buttonStyleSmall"
+			android:background="@android:drawable/btn_default_small"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"

DroidRage/res/layout/activity_view_task.xml

@@ -189,13 +189,13 @@
 
                 <Button
                     android:id="@+id/task_complete_button"
-                    style="@style/TextAppearance.EditEvent_LabelSmall"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginBottom="0dip"
                     android:layout_marginTop="0dip"
-                    android:background="?android:attr/selectableItemBackground"
+                    android:background="@android:drawable/btn_default_small"
                     android:contentDescription="@string/reminders_label"
                     android:gravity="top"
                     android:minHeight="20dip"

DroidRage/res/layout/edit_event_1.xml

@@ -208,6 +208,8 @@
 
         <Button
             android:id="@+id/add_agenda_button"
+            style="?android:attr/buttonStyleSmall"
+			android:background="@android:drawable/btn_default_small"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"

DroidRage/res/layout/edit_event_2.xml

@@ -73,6 +73,8 @@
 
     <Button
         android:id="@+id/add_guests_btn"
+        style="?android:attr/buttonStyleSmall"
+		android:background="@android:drawable/btn_default_small"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"

DroidRage/res/menu/edit_item_menu.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/edit_item_task" android:showAsAction="ifRoom" android:title="Edit" android:orderInCategory="100" android:icon="@drawable/ic_menu_edit"></item>
-    <item android:id="@+id/delete_item_task" android:orderInCategory="200" android:title="Delete" android:icon="@drawable/ic_menu_delete" android:showAsAction="ifRoom"></item>
-
 
-</menu>
+    <item
+        android:id="@+id/edit_item_task"
+        android:icon="@drawable/ic_menu_edit"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:title="Edit">
+    </item>
+    <item
+        android:id="@+id/delete_item_task"
+        android:icon="@drawable/ic_menu_delete"
+        android:orderInCategory="200"
+        android:showAsAction="ifRoom"
+        android:title="Delete">
+    </item>
+
+</menu>

DroidRage/res/menu/editor_options_menu.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_save"
-          android:icon="@drawable/ic_menu_save"
-          android:alphabeticShortcut='s'
-          android:title="@string/action_save"
-          android:showAsAction="ifRoom|withText" />
-    <item android:id="@+id/menu_revert"
-          android:icon="@drawable/ic_menu_revert"
-          android:title="@string/menu_revert" />
-    <item android:id="@+id/menu_delete"
-          android:icon="@drawable/ic_menu_delete"
-          android:title="@string/action_delete"
-          android:showAsAction="ifRoom|withText" />
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_save"
+        android:alphabeticShortcut="s"
+        android:icon="@drawable/ic_menu_save"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/action_save"/>
+    <item
+        android:id="@+id/menu_revert"
+        android:icon="@drawable/ic_menu_revert"
+        android:title="@string/menu_revert"/>
+    <item
+        android:id="@+id/menu_delete"
+        android:icon="@drawable/ic_menu_delete"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/action_delete"/>
+
 </menu>

DroidRage/res/menu/new_and_refresh_menu.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_new"
+        android:icon="@drawable/ic_action_new"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:title="New Task">
+    </item>
+    <item
+        android:id="@+id/action_refresh"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="200"
+        android:showAsAction="ifRoom"
+        android:title="Refresh">
+    </item>
+
+</menu>

DroidRage/res/menu/new_meeting.xml

@@ -7,4 +7,5 @@
         android:showAsAction="ifRoom|withText"
         android:title="@+string/action_save">
     </item>
-</menu>
+
+</menu>

DroidRage/res/menu/notes_fragment.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-	 <item
+
+    <item
         android:id="@+id/action_new_note"
         android:icon="@drawable/ic_action_new"
         android:orderInCategory="100"
         android:showAsAction="ifRoom"
         android:title="@string/action_new_note"/>
-   <item
+    <item
         android:id="@id/action_refresh"
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="200"
         android:showAsAction="ifRoom"
         android:title="@string/action_refresh"/>
-
 
-</menu>
+</menu>

DroidRage/res/menu/swipe_list_test.xml

@@ -4,7 +4,7 @@
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_action_settings"
         android:showAsAction="always"
-        android:title="@string/settings"/>
+        android:title="@string/action_settings"/>
     <item
         android:id="@+id/action_done"
         android:icon="@drawable/ic_action_done"