diff options
19 files changed, 7 insertions, 8 deletions
diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml index f1e54f7c3..a0335305f 100644 --- a/app/src/main/res/layout/videoplayer_activity.xml +++ b/app/src/main/res/layout/videoplayer_activity.xml @@ -21,12 +21,11 @@ <ImageButton android:id="@+id/butPlay" android:contentDescription="@string/pause_label" - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center" - android:scaleType="fitXY" android:background="@drawable/overlay_button_circle_background" - android:src="@drawable/ic_action_pause_over_video"/> + android:src="@drawable/ic_av_pause_circle_outline_80dp"/> <LinearLayout android:id="@+id/overlay" diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 3b791f444..26dd2ec4c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -417,8 +417,8 @@ public abstract class PlaybackController { pauseResource = res.getResourceId(1, R.drawable.ic_pause_grey600_36dp); res.recycle(); } else { - playResource = R.drawable.ic_action_play_over_video; - pauseResource = R.drawable.ic_action_pause_over_video; + playResource = R.drawable.ic_av_play_circle_outline_80dp; + pauseResource = R.drawable.ic_av_pause_circle_outline_80dp; } switch (status) { diff --git a/core/src/main/res/drawable-hdpi/ic_action_pause_over_video.png b/core/src/main/res/drawable-hdpi/ic_action_pause_over_video.png Binary files differdeleted file mode 100755 index 64b07728f..000000000 --- a/core/src/main/res/drawable-hdpi/ic_action_pause_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_action_play_over_video.png b/core/src/main/res/drawable-hdpi/ic_action_play_over_video.png Binary files differdeleted file mode 100755 index a364ca7c2..000000000 --- a/core/src/main/res/drawable-hdpi/ic_action_play_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..6f9df0934 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..bddb0b024 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_action_pause_over_video.png b/core/src/main/res/drawable-mdpi/ic_action_pause_over_video.png Binary files differdeleted file mode 100755 index f478ac321..000000000 --- a/core/src/main/res/drawable-mdpi/ic_action_pause_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_action_play_over_video.png b/core/src/main/res/drawable-mdpi/ic_action_play_over_video.png Binary files differdeleted file mode 100755 index 835ff3636..000000000 --- a/core/src/main/res/drawable-mdpi/ic_action_play_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..08c523d48 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..27738aacb --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png b/core/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png Binary files differdeleted file mode 100755 index b0777a023..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_action_play_over_video.png b/core/src/main/res/drawable-xhdpi/ic_action_play_over_video.png Binary files differdeleted file mode 100755 index 24331a48c..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_action_play_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..3288241e7 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..db7b695e9 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png b/core/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png Binary files differdeleted file mode 100755 index fa85601cf..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png b/core/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png Binary files differdeleted file mode 100755 index 121be211e..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..48e28102a --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png Binary files differnew file mode 100644 index 000000000..b5918c0f1 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b6dc96bf1..4ab54189e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 12 21:44:21 CEST 2014 +#Thu Nov 20 19:41:23 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip |
