Merge branch 'master' into material

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml

app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java

@@ -175,11 +175,16 @@ public class AlarmIntentService extends IntentService {
 					}
 
 					NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
-							.setSmallIcon(R.drawable.ic_launcher).setWhen(event.getStartTime().getTime())
-							.setContentTitle(event.getTitle()).setContentText(contentText)
+							.setSmallIcon(R.drawable.ic_stat_fosdem)
+							.setWhen(event.getStartTime().getTime())
+							.setContentTitle(event.getTitle())
+							.setContentText(contentText)
 							.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText).setSummaryText(trackName))
-							.setContentInfo(event.getRoomName()).setContentIntent(eventPendingIntent).setAutoCancel(true)
-							.setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_HIGH);
+							.setContentInfo(event.getRoomName())
+							.setContentIntent(eventPendingIntent)
+							.setAutoCancel(true)
+							.setDefaults(defaultFlags)
+							.setPriority(NotificationCompat.PRIORITY_HIGH);
 
 					// Blink the LED with FOSDEM color if enabled in the options
 					if (sharedPreferences.getBoolean(SettingsFragment.KEY_PREF_NOTIFICATIONS_LED, false)) {

app/src/main/res/layout/track_schedule_event.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+             android:layout_height="match_parent">
 
     <ProgressBar
         android:id="@+id/progress"
@@ -9,23 +9,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:visibility="gone"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
+        android:layout_height="match_parent"/>
 
     <com.viewpagerindicator.UnderlinePageIndicator
         android:id="@+id/indicator"
         android:layout_width="match_parent"
-            android:layout_height="2dp" />
-    </LinearLayout>
+        android:layout_height="2dp"
+        android:layout_gravity="bottom"/>
 
 </FrameLayout>