updated PRs

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

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 2ba4a0b..1c2b6cc 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -39,7 +39,7 @@
                <ListView android:id="@android:id/list"
                        android:layout_width="fill_parent"
                        android:layout_height="fill_parent"
-                       android:divider="@drawable/uploader_list_separator"
+                       android:divider="@color/list_divider_background"
                        android:dividerHeight="1dip">
                </ListView>
 
@@ -53,17 +53,18 @@
            android:orientation="horizontal" >
 
                <android.support.v7.widget.AppCompatButton
-                   android:id="@+id/uploader_new_folder"
+                       android:theme="@style/Button"
+                   android:id="@+id/uploader_cancel"
                        style="@style/ownCloud.Button"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
-                   android:text="@string/uploader_btn_new_folder_text" />
+                   android:text="@string/common_cancel" />
 
                <android.support.v7.widget.AppCompatButton
                    android:id="@+id/uploader_choose_folder"
-                       style="@style/ownCloud.Button"
+                       android:theme="@style/Button.Primary"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"