From 8db161017f55a710bd91aa14fe9c1b24d4efdeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 11 Feb 2013 17:32:19 +0100
Subject: The newProviderButton gets user to the DialogFragment correctly.

The problem in the previous commit was that I had to modify the fragment
layout, instead of that of the Activity. I learnt how to obtain and
modify it from here:
https://developer.android.com/reference/android/app/ListFragment.html
---
 res/layout/activity_configuration_wizard.xml | 11 -----------
 res/layout/activity_provider_list.xml        | 10 ----------
 res/layout/provider_list_fragment.xml        | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 res/layout/activity_provider_list.xml
 create mode 100644 res/layout/provider_list_fragment.xml

(limited to 'res/layout')

diff --git a/res/layout/activity_configuration_wizard.xml b/res/layout/activity_configuration_wizard.xml
index 7a0823d9..264ccf98 100644
--- a/res/layout/activity_configuration_wizard.xml
+++ b/res/layout/activity_configuration_wizard.xml
@@ -5,15 +5,4 @@
     android:layout_height="match_parent"
     tools:context=".ConfigurationWizard" >
 
-    <Button
-        android:id="@+id/buttonNewProvider"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginBottom="24dp"
-        android:layout_marginLeft="24dp"
-        android:onClick="addNewProvider"
-        android:text="@string/new_provider_button" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_provider_list.xml b/res/layout/activity_provider_list.xml
deleted file mode 100644
index 6a6dafec..00000000
--- a/res/layout/activity_provider_list.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/provider_list"
-    android:name="se.leap.leapclient.ProviderListFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    tools:context=".ProviderListActivity"
-    tools:layout="@android:layout/list_content" />
diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
new file mode 100644
index 00000000..9bb775d7
--- /dev/null
+++ b/res/layout/provider_list_fragment.xml
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+         android:orientation="vertical"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:paddingLeft="8dp"
+         android:paddingRight="8dp">
+
+    <ListView
+        android:id="@id/android:list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="addNewProvider"
+        android:text="@string/new_provider_button" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3