Merge branch 'fix_blurry_videoplayer_overlay' of git://github.com/jmue/AntennaPod into jmue-fix_blurry_videoplayer_overlay
Conflicts: gradle/wrapper/gradle-wrapper.properties
@ -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"
|
||||
|
@ -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) {
|
||||
|
Before Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 7.0 KiB |
After Width: | Height: | Size: 3.2 KiB |
After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.4 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 5.1 KiB |
After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 7.9 KiB |
After Width: | Height: | Size: 8.0 KiB |