X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e0ce2d4d5c6eea8bf7801e8f1e3960943bc54017..6b84d83b3544f8de4e56186f6ecbccd3d612702b:/src/com/owncloud/android/media/MediaControlView.java diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java index 9f481230..5f2d46d4 100644 --- a/src/com/owncloud/android/media/MediaControlView.java +++ b/src/com/owncloud/android/media/MediaControlView.java @@ -1,11 +1,12 @@ -/* ownCloud Android client application - * - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,6 +43,8 @@ import java.util.Formatter; import java.util.Locale; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; + /** * View containing controls for a {@link MediaPlayer}. @@ -51,8 +54,6 @@ import com.owncloud.android.R; * * It synchronizes itself with the state of the * {@link MediaPlayer}. - * - * @author David A. Velasco */ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeListener, OnTouchListener */ implements OnClickListener, OnSeekBarChangeListener { @@ -220,7 +221,10 @@ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi if (mProgress != null) { if (mProgress instanceof SeekBar) { SeekBar seeker = (SeekBar) mProgress; + DisplayUtils.colorPreLollipopHorizontalSeekBar(seeker); seeker.setOnSeekBarChangeListener(this); + } else { + DisplayUtils.colorPreLollipopHorizontalProgressBar(mProgress); } mProgress.setMax(1000); }