From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 8 Oct 2013 09:28:57 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.4.6
X-Git-Tag: oc-android-1.4.6~6^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7d512002911ff7ed915995bf58b12e69783438bd?hp=a67a6766a6ca69bb97d2fdc87256ec9f0fa5122d

Merge branch 'develop' into release-1.4.6
---

diff --git a/res/layout/media_control.xml b/res/layout/media_control.xml
index 489c9973..f308edca 100644
--- a/res/layout/media_control.xml
+++ b/res/layout/media_control.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="4dip"
+        android:paddingTop="4dp"
         android:orientation="horizontal"
         >
 
@@ -58,33 +58,33 @@
             android:id="@+id/currentTimeText"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:paddingTop="4dip"
-            android:paddingStart="4dip"
+            android:paddingTop="4dp"
+            android:paddingStart="4dp"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingEnd="4dip"
+            android:paddingEnd="4dp"
             android:text="@string/placeholder_media_time"
             />
 
         <SeekBar
             android:id="@+id/progressBar"
             style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_height="32dip"
+            android:layout_height="32dp"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true" />
 
         <TextView android:id="@+id/totalTimeText"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:paddingTop="4dip"
-            android:paddingEnd="4dip"
+            android:paddingTop="4dp"
+            android:paddingEnd="4dp"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="4dip"
+            android:paddingStart="4dp"
             android:text="@string/placeholder_media_time"
             />