Merge branch 'master' into material
Conflicts: app/build.gradle app/src/main/AndroidManifest.xml
|
@ -175,11 +175,16 @@ public class AlarmIntentService extends IntentService {
|
||||||
}
|
}
|
||||||
|
|
||||||
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
|
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
|
||||||
.setSmallIcon(R.drawable.ic_launcher).setWhen(event.getStartTime().getTime())
|
.setSmallIcon(R.drawable.ic_stat_fosdem)
|
||||||
.setContentTitle(event.getTitle()).setContentText(contentText)
|
.setWhen(event.getStartTime().getTime())
|
||||||
|
.setContentTitle(event.getTitle())
|
||||||
|
.setContentText(contentText)
|
||||||
.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText).setSummaryText(trackName))
|
.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText).setSummaryText(trackName))
|
||||||
.setContentInfo(event.getRoomName()).setContentIntent(eventPendingIntent).setAutoCancel(true)
|
.setContentInfo(event.getRoomName())
|
||||||
.setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_HIGH);
|
.setContentIntent(eventPendingIntent)
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setDefaults(defaultFlags)
|
||||||
|
.setPriority(NotificationCompat.PRIORITY_HIGH);
|
||||||
|
|
||||||
// Blink the LED with FOSDEM color if enabled in the options
|
// Blink the LED with FOSDEM color if enabled in the options
|
||||||
if (sharedPreferences.getBoolean(SettingsFragment.KEY_PREF_NOTIFICATIONS_LED, false)) {
|
if (sharedPreferences.getBoolean(SettingsFragment.KEY_PREF_NOTIFICATIONS_LED, false)) {
|
||||||
|
|
BIN
app/src/main/res/drawable-hdpi-v11/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.6 KiB |
BIN
app/src/main/res/drawable-hdpi/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
app/src/main/res/drawable-mdpi-v11/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 809 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/drawable-mdpi/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 440 B |
BIN
app/src/main/res/drawable-xhdpi-v11/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 6 KiB |
BIN
app/src/main/res/drawable-xhdpi/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
app/src/main/res/drawable-xxhdpi-v11/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 9.2 KiB |
BIN
app/src/main/res/drawable-xxhdpi/ic_stat_fosdem.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" >
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/progress"
|
android:id="@+id/progress"
|
||||||
|
@ -9,23 +9,17 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:visibility="gone" />
|
android:visibility="gone"/>
|
||||||
|
|
||||||
<LinearLayout
|
<android.support.v4.view.ViewPager
|
||||||
|
android:id="@+id/pager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"/>
|
||||||
android:orientation="vertical" >
|
|
||||||
|
|
||||||
<android.support.v4.view.ViewPager
|
<com.viewpagerindicator.UnderlinePageIndicator
|
||||||
android:id="@+id/pager"
|
android:id="@+id/indicator"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="2dp"
|
||||||
android:layout_weight="1" />
|
android:layout_gravity="bottom"/>
|
||||||
|
|
||||||
<com.viewpagerindicator.UnderlinePageIndicator
|
|
||||||
android:id="@+id/indicator"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="2dp" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|