From: masensio <masensio@solidgear.es>
Date: Mon, 22 Jun 2015 12:14:36 +0000 (+0200)
Subject: Merge pull request #1023 from owncloud/fix_issues_from_Transifex
X-Git-Tag: oc-android-1.7.2~1^2~11^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fb57bbc8c868ad9b2ec304f0bade53b892eaa6e7?hp=69a5b6f25da7e7c6fc2c9ee7b03966e67163289d

Merge pull request #1023 from owncloud/fix_issues_from_Transifex

Message with count of list(s) and folder(s) reestructured for better translations
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d989b1e..d306fc60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,7 +36,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index a5351f04..0210e17c 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -21,15 +21,28 @@
 	android:layout_height="wrap_content" android:orientation="vertical"
 	android:layout_width="wrap_content" android:background="#fefefe"
 	android:gravity="center">
-	<TextView android:layout_width="fill_parent" android:text="@string/uploader_top_message"
-		android:layout_height="wrap_content" android:id="@+id/drawer_username" android:textColor="@android:color/black"
-		android:gravity="center_horizontal"></TextView>
+
+	<TextView android:layout_width="fill_parent"
+		android:text="@string/uploader_top_message"
+		android:layout_height="wrap_content"
+		android:id="@+id/drawer_username"
+		android:textColor="@android:color/black"
+		android:gravity="center_horizontal">
+	</TextView>
+
 	<FrameLayout android:layout_height="fill_parent"
-		android:layout_width="fill_parent" android:id="@+id/frameLayout1"
-		android:layout_below="@+id/drawer_username" android:layout_above="@+id/linearLayout1">
-		<ListView android:id="@android:id/list" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
-			android:dividerHeight="1dip"></ListView>
+		android:layout_width="fill_parent"
+		android:id="@+id/frameLayout1"
+		android:layout_below="@+id/drawer_username"
+		android:layout_above="@+id/linearLayout1">
+
+		<ListView android:id="@android:id/list"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:divider="@drawable/uploader_list_separator"
+			android:dividerHeight="1dip">
+		</ListView>
+
 	</FrameLayout>
 
 	<LinearLayout
diff --git a/res/layout/uploader_list_item_layout.xml b/res/layout/uploader_list_item_layout.xml
index d2d0005b..f83608e4 100644
--- a/res/layout/uploader_list_item_layout.xml
+++ b/res/layout/uploader_list_item_layout.xml
@@ -35,7 +35,7 @@
     <TextView 
         android:text="TextView" 
         android:layout_width="fill_parent" 
-        android:id="@+id/drawer_username" 
+        android:id="@+id/filename"
         android:layout_height="wrap_content" 
         android:textColor="@android:color/black"
 		android:layout_gravity="center_vertical"
diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 533bb991..7bf4218f 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -426,7 +426,7 @@ public class Uploader extends FileActivity
                                                 data,
                                                 R.layout.uploader_list_item_layout,
                                                 new String[] {"dirname"},
-                                                new int[] {R.id.textView1});
+                                                new int[] {R.id.filename});
             
             mListView.setAdapter(sa);
             Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);