Merge branch 'master' into release-1.4.4

[pub/Android/ownCloud.git] / res / layout / media_control.xml

diff --git a/res/layout/media_control.xml b/res/layout/media_control.xml
index 69d27c6..489c997 100644 (file)
--- a/res/layout/media_control.xml
+++ b/res/layout/media_control.xml
@@ -5,9 +5,8 @@
   Copyright (C) 2012-2013  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 2 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
@@ -33,11 +32,6 @@
         >
 
         <ImageButton 
-            android:id="@+id/previousBtn" 
-            style="@android:style/MediaButton.Previous" 
-            android:contentDescription="@string/media_previous_description"
-            />
-        <ImageButton 
             android:id="@+id/rewindBtn" 
             style="@android:style/MediaButton.Rew" 
             android:contentDescription="@string/media_rewind_description"
@@ -52,11 +46,6 @@
             style="@android:style/MediaButton.Ffwd" 
             android:contentDescription="@string/media_forward_description"
             />
-        <ImageButton 
-            android:id="@+id/nextBtn" 
-            style="@android:style/MediaButton.Next" 
-            android:contentDescription="@string/media_next_description"
-            />
 
     </LinearLayout>