From c849913fba3f5b692309570415f85e9bdb8cceeb Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 22:54:56 -0700
Subject: Beginnings of a Dashboard Activity Matching layout and menu XML And
 don't forget strings

---
 res/layout/client_dashboard.xml | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 res/layout/client_dashboard.xml

(limited to 'res/layout')

diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
new file mode 100644
index 00000000..599a0972
--- /dev/null
+++ b/res/layout/client_dashboard.xml
@@ -0,0 +1,56 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/dashboardLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Dashboard" >
+
+    <LinearLayout
+        android:id="@+id/providerLine"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="?android:attr/selectableItemBackground" >
+
+        <LinearLayout
+            android:id="@+id/providerLabelWrapper"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingLeft="10dp" >
+
+            <TextView
+                android:id="@+id/providerLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:text="@string/provider_label"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="24sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/providerNameWrapper"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingLeft="15dp" >
+
+            <TextView
+                android:id="@+id/providerName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:text="@string/provider_label_none"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b6e47ac59c3e853b23d4392eec33bbeb2f068f17 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 23:35:42 -0700
Subject: Add EIP Service item in Dashboard

---
 res/layout/client_dashboard.xml | 23 +++++++++++++++++++++++
 res/layout/eip_overview.xml     | 27 +++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 res/layout/eip_overview.xml

(limited to 'res/layout')

diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
index 599a0972..9d9b7a40 100644
--- a/res/layout/client_dashboard.xml
+++ b/res/layout/client_dashboard.xml
@@ -53,4 +53,27 @@
 
         </LinearLayout>
     </LinearLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="2dp"
+        android:layout_marginBottom="15dp"
+        android:background="@android:drawable/divider_horizontal_bright" />
+
+    <LinearLayout
+        android:id="@+id/servicesCollection"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.11"
+        android:orientation="vertical" >
+
+        <ViewStub
+            android:id="@+id/eipOverviewStub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/eipOverview"
+            android:layout="@layout/eip_overview" />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
new file mode 100644
index 00000000..d8defcbc
--- /dev/null
+++ b/res/layout/eip_overview.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="10dp" >
+
+    <TextView
+        android:id="@+id/eipType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="15dp"
+        android:layout_toLeftOf="@+id/eipSwitch"
+        android:text="@string/eip_type_active"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <Switch
+        android:id="@+id/eipSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="10dp" />
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From d21e8390e90437f0d053374f8e304ca3f592beb9 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 23:37:33 -0700
Subject: More fun with EIP item entry. Added parts to expand listing for quick
 info and settings access

---
 res/layout/eip_overview.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index d8defcbc..21d4ae38 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_overview.xml
@@ -13,6 +13,8 @@
         android:layout_marginBottom="10dp"
         android:layout_marginLeft="15dp"
         android:layout_toLeftOf="@+id/eipSwitch"
+        android:clickable="false"
+        android:onClick="toggleOverview"
         android:text="@string/eip_type_active"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -24,4 +26,35 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="10dp" />
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/eipType"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:visibility="gone" >
+
+        <ImageView
+            android:id="@+id/eipSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:contentDescription="@string/eip_settings_button_description"
+            android:src="@drawable/ic_sysbar_quicksettings" />
+
+        <TextView
+            android:id="@+id/eipStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:text="@string/eip_status" />
+
+    </RelativeLayout>
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 92c32b0b96938009af55ed28920472f22a4614ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 31 Jan 2013 22:12:21 +0100
Subject: Problems with downloaded file, the emulator cannot find the file
 downloaded.

Seen http://code.google.com/p/android/issues/detail?id=18462 and decided
to look for another solution.

First solution thought (and going to be the next test): HTTP Get request
:)
---
 res/layout/activity_provider_list.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 res/layout/activity_provider_list.xml

(limited to 'res/layout')

diff --git a/res/layout/activity_provider_list.xml b/res/layout/activity_provider_list.xml
new file mode 100644
index 00000000..6a6dafec
--- /dev/null
+++ b/res/layout/activity_provider_list.xml
@@ -0,0 +1,10 @@
+<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" />
-- 
cgit v1.2.3


From 6e0142a335eafe8a9b0e41b0e968038c0aeabd11 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Thu, 7 Feb 2013 01:33:03 -0700
Subject: Refactor ProviderListActivity.class into ConfigurationWizard.class,
 Moves towards our wizard flow; Addresses #1497 #1500

---
 res/layout/activity_configuration_wizard.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 res/layout/activity_configuration_wizard.xml

(limited to 'res/layout')

diff --git a/res/layout/activity_configuration_wizard.xml b/res/layout/activity_configuration_wizard.xml
new file mode 100644
index 00000000..264ccf98
--- /dev/null
+++ b/res/layout/activity_configuration_wizard.xml
@@ -0,0 +1,8 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/configuration_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ConfigurationWizard" >
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From e3acc71aaedfcf97b2adee907b6587e3c1eadf48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 7 Feb 2013 21:25:58 +0100
Subject: Button not working from ConfigurationWizard.

Trying to test cancel button from created new dialog.
---
 res/layout/activity_configuration_wizard.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/activity_configuration_wizard.xml b/res/layout/activity_configuration_wizard.xml
index 264ccf98..7a0823d9 100644
--- a/res/layout/activity_configuration_wizard.xml
+++ b/res/layout/activity_configuration_wizard.xml
@@ -5,4 +5,15 @@
     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
-- 
cgit v1.2.3


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


From 162afa5bfa6485f3aacb3f60e9c92fa0c3bfa7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 11 Feb 2013 20:28:59 +0100
Subject: Gets provider.json from custom url (assuming the file is at the root
 of the website, just as bitmask.net/provider.json), and writes it to a file
 in ~/leap_android.

Next steps: parse that file and download eip-service and cert.
---
 res/layout/new_provider_dialog.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 res/layout/new_provider_dialog.xml

(limited to 'res/layout')

diff --git a/res/layout/new_provider_dialog.xml b/res/layout/new_provider_dialog.xml
new file mode 100644
index 00000000..28122867
--- /dev/null
+++ b/res/layout/new_provider_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:hint="@string/new_provider_uri" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 75728462433b19567710f54a9d4767681b10be95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 18:07:07 +0200
Subject: Coded dialog (now there is a button in the Dashboard), time to test.

I need to implement bypass for dev.bitmask.net, because bitmask.net is
down.
---
 res/layout/log_in_dialog.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 res/layout/log_in_dialog.xml

(limited to 'res/layout')

diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
new file mode 100644
index 00000000..6f28118d
--- /dev/null
+++ b/res/layout/log_in_dialog.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context=".LogInDialog" >
+
+    <EditText
+        android:id="@+id/username_entered"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="16dp"
+        android:ems="10"
+        android:hint="@string/username_ask"
+        android:inputType="textUri" >
+
+        <requestFocus />
+    </EditText>
+
+    <EditText
+        android:id="@+id/password_entered"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:hint="@string/password_ask"
+        android:inputType="textPassword" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From bfe2263d6b73159a4f929bc7b1fdeb724c88e8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 20:17:43 +0200
Subject: Added danger mode: we can bypass dev.bitmask.net hostname io
 exception.

---
 res/layout/new_provider_dialog.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/new_provider_dialog.xml b/res/layout/new_provider_dialog.xml
index 28122867..19b8f442 100644
--- a/res/layout/new_provider_dialog.xml
+++ b/res/layout/new_provider_dialog.xml
@@ -15,4 +15,10 @@
         android:layout_marginBottom="4dp"
         android:hint="@string/new_provider_uri" />
 
+    <CheckBox
+        android:id="@+id/danger_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/danger_checkbox" />
+
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 33338d43e0e83329a7c46807e096b8148e19aff7 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 04:09:03 -0600
Subject: Quite basic staring and stopping of VPN

---
 res/layout/eip_overview.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index 21d4ae38..9cb659f2 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_overview.xml
@@ -5,18 +5,29 @@
     android:layout_marginTop="10dp" >
 
     <TextView
-        android:id="@+id/eipType"
+        android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
+        android:layout_marginLeft="10dp"
+        android:clickable="true"
+        android:onClick="toggleEipOverview"
+        android:text="@string/eip_service_label"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+    
+    <TextView
+        android:id="@+id/eipType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/eipLabel"
+        android:layout_marginLeft="10dp"
         android:layout_marginBottom="10dp"
-        android:layout_marginLeft="15dp"
-        android:layout_toLeftOf="@+id/eipSwitch"
-        android:clickable="false"
-        android:onClick="toggleOverview"
+        android:layout_toRightOf="@+id/eipLabel"
+        android:clickable="true"
+        android:onClick="toggleEipOverview"
         android:text="@string/eip_type_active"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <Switch
         android:id="@+id/eipSwitch"
@@ -27,6 +38,7 @@
         android:layout_marginRight="10dp" />
 
     <RelativeLayout
+        android:id="@+id/eipDetail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-- 
cgit v1.2.3


From 276b8f7dbc7763e284f246a1c538bd06dd8be756 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 04:36:08 -0600
Subject: Bring up VPN connection log on status line click. Also show it on
 click of "Configure" button on system notification popup. Also allow toggling
 of status line.

---
 res/layout/eip_overview.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index 9cb659f2..738c82ef 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_overview.xml
@@ -56,6 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
+            android:layout_margin="10dp"
             android:contentDescription="@string/eip_settings_button_description"
             android:src="@drawable/ic_sysbar_quicksettings" />
 
@@ -65,8 +66,11 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
+            android:clickable="true"
+            android:onClick="showEIPLog"
             android:text="@string/eip_status" />
 
     </RelativeLayout>
 
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From dff5aa6e1c4df4af012899df7bf26e4f20f3ab26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 16:44:22 +0200
Subject: ConfigurationWizard shows domain and name.

Items from the provider's list have 2 rows, first one with the domain and the other with the name.

Names from preseeded providers are fetched from the assets file, because we don't download provider.json until they select it.
---
 res/layout/provider_list_fragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res/layout')

diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
index 9bb775d7..d52fcca4 100644
--- a/res/layout/provider_list_fragment.xml
+++ b/res/layout/provider_list_fragment.xml
@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
+	android:layout_alignParentTop="true"
         android:drawSelectorOnTop="false" />
 
     <Button
@@ -18,4 +19,4 @@
         android:onClick="addNewProvider"
         android:text="@string/new_provider_button" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
-- 
cgit v1.2.3


From 6ada10858719786e489938b3124d1d6015a70421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 17:55:22 +0200
Subject: The added provider is selected automatically.

I've also removed a lot of finishes when things go wrong (so that it should be returning to the previous activity/fragment).
---
 res/layout/provider_list_fragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout')

diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
index d52fcca4..0db0734b 100644
--- a/res/layout/provider_list_fragment.xml
+++ b/res/layout/provider_list_fragment.xml
@@ -16,7 +16,7 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:onClick="addNewProvider"
+        android:onClick="addAndSelectNewProvider"
         android:text="@string/new_provider_button" />
 
 </LinearLayout>
-- 
cgit v1.2.3


From 9e7693c112a7c85cae998ae538643cda9660ff7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 27 Jun 2013 20:29:33 +0200
Subject: Coded new fragment appearance

Domain, name and description come from provider.json

Next step: code buttons to login or to use anonymously.
---
 res/layout/activity_configuration_wizard.xml |  8 ------
 res/layout/configuration_wizard_activity.xml |  8 ++++++
 res/layout/provider_detail_fragment.xml      | 40 ++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)
 delete mode 100644 res/layout/activity_configuration_wizard.xml
 create mode 100644 res/layout/configuration_wizard_activity.xml
 create mode 100644 res/layout/provider_detail_fragment.xml

(limited to 'res/layout')

diff --git a/res/layout/activity_configuration_wizard.xml b/res/layout/activity_configuration_wizard.xml
deleted file mode 100644
index 264ccf98..00000000
--- a/res/layout/activity_configuration_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/configuration_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ConfigurationWizard" >
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/configuration_wizard_activity.xml b/res/layout/configuration_wizard_activity.xml
new file mode 100644
index 00000000..264ccf98
--- /dev/null
+++ b/res/layout/configuration_wizard_activity.xml
@@ -0,0 +1,8 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/configuration_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ConfigurationWizard" >
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/provider_detail_fragment.xml b/res/layout/provider_detail_fragment.xml
new file mode 100644
index 00000000..eb90fad9
--- /dev/null
+++ b/res/layout/provider_detail_fragment.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/provider_detail_domain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="16dp"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/provider_detail_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:textStyle="italic"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/provider_detail_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:textStyle="normal"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 99a4d94564635f0223d447bc9bcf081cadd8ff36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 2 Jul 2013 19:20:58 +0200
Subject: User messages are added to the new recovery dialog

When login is not successful, a new recovery dialog is prompted with a
message about the previous error.
---
 res/layout/log_in_dialog.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
index 6f28118d..4c9fdbad 100644
--- a/res/layout/log_in_dialog.xml
+++ b/res/layout/log_in_dialog.xml
@@ -6,6 +6,13 @@
     android:orientation="vertical"
     tools:context=".LogInDialog" >
 
+    <TextView
+        android:id="@+id/user_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
     <EditText
         android:id="@+id/username_entered"
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From b358f7883257fdf2c5ca391ce7dcc51ff28f6266 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Thu, 4 Jul 2013 08:41:32 -0600
Subject: Clean up AboutFragment, remove donation text

---
 res/layout/about.xml | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 5820d291..366bdcec 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -33,19 +33,6 @@
             android:autoLink="all"
             android:text="@string/copyright_guicode" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:id="@+id/donatestring"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
         <TextView
             android:id="@+id/translation"
             android:layout_width="match_parent"
-- 
cgit v1.2.3


From 8addeb2ced0db9979877e51347f076c3bf0b33b2 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Fri, 12 Jul 2013 21:39:20 -0600
Subject: Remove credit for pieces we're not using from About fragment

---
 res/layout/about.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 366bdcec..3404686b 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -74,17 +74,6 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/file_dialog"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_file_dialog" />
-
         <Space
             android:layout_width="match_parent"
             android:layout_height="20sp" />
-- 
cgit v1.2.3


From 2adf51e117e638f520a9d094fd806fb81ecd6207 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Fri, 12 Jul 2013 21:40:29 -0600
Subject: Full "LEAP Encryption Access Project" in About page

---
 res/layout/about.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout')

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 5820d291..635d17a8 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
-            android:text="@string/copyright_blinktgui" />
+            android:text="@string/copyright_leapgui" />
 
         <Space
             android:layout_width="match_parent"
-- 
cgit v1.2.3


From f9131ce775b180cee3fa8ec1ac52290a7f58d1ef Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 18:26:31 -0600
Subject: Refactor EIP UI and control logic out of Dashboard into a Fragment

---
 res/layout/client_dashboard.xml     | 11 +-----
 res/layout/eip_overview.xml         | 76 -------------------------------------
 res/layout/eip_service_fragment.xml | 74 ++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 86 deletions(-)
 delete mode 100644 res/layout/eip_overview.xml
 create mode 100644 res/layout/eip_service_fragment.xml

(limited to 'res/layout')

diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
index 9d9b7a40..9f05cfbc 100644
--- a/res/layout/client_dashboard.xml
+++ b/res/layout/client_dashboard.xml
@@ -65,15 +65,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="0.11"
-        android:orientation="vertical" >
-
-        <ViewStub
-            android:id="@+id/eipOverviewStub"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/eipOverview"
-            android:layout="@layout/eip_overview" />
-
-    </LinearLayout>
+        android:orientation="vertical" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
deleted file mode 100644
index 738c82ef..00000000
--- a/res/layout/eip_overview.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="10dp" >
-
-    <TextView
-        android:id="@+id/eipLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dp"
-        android:clickable="true"
-        android:onClick="toggleEipOverview"
-        android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-    
-    <TextView
-        android:id="@+id/eipType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/eipLabel"
-        android:layout_marginLeft="10dp"
-        android:layout_marginBottom="10dp"
-        android:layout_toRightOf="@+id/eipLabel"
-        android:clickable="true"
-        android:onClick="toggleEipOverview"
-        android:text="@string/eip_type_active"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <Switch
-        android:id="@+id/eipSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dp" />
-
-    <RelativeLayout
-        android:id="@+id/eipDetail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/eipType"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="10dp"
-        android:visibility="gone" >
-
-        <ImageView
-            android:id="@+id/eipSettings"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/eip_settings_button_description"
-            android:src="@drawable/ic_sysbar_quicksettings" />
-
-        <TextView
-            android:id="@+id/eipStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:clickable="true"
-            android:onClick="showEIPLog"
-            android:text="@string/eip_status" />
-
-    </RelativeLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
new file mode 100644
index 00000000..8f7c1d22
--- /dev/null
+++ b/res/layout/eip_service_fragment.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/eipServiceFragment"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp" >
+
+    <TextView
+        android:id="@+id/eipLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="10dp"
+        android:clickable="true"
+        android:text="@string/eip_service_label"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+    
+    <TextView
+        android:id="@+id/eipType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/eipLabel"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_toRightOf="@+id/eipLabel"
+        android:clickable="true"
+        android:onClick="toggleEipOverview"
+        android:text="@string/eip_type_active"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Switch
+        android:id="@+id/eipSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="10dp" />
+
+    <RelativeLayout
+        android:id="@+id/eipDetail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/eipType"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:visibility="gone" >
+
+        <ImageView
+            android:id="@+id/eipSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_margin="10dp"
+            android:contentDescription="@string/eip_settings_button_description"
+            android:src="@drawable/ic_sysbar_quicksettings" />
+
+        <TextView
+            android:id="@+id/eipStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:clickable="true"
+            android:text="@string/eip_status" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b19dc954b381c1e266395fdc1f19a1246096d4ab Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 21:57:43 -0600
Subject: Add a progress bar while VPN connection is being established

---
 res/layout/eip_service_fragment.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
index 8f7c1d22..885c78a3 100644
--- a/res/layout/eip_service_fragment.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -36,6 +36,17 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="10dp" />
+    
+    <ProgressBar 
+        android:id="@+id/eipProgress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/Widget.Holo.ProgressBar.Horizontal"
+        android:indeterminate="true"
+        android:visibility="gone"
+        android:layout_below="@id/eipLabel"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp" />
 
     <RelativeLayout
         android:id="@+id/eipDetail"
-- 
cgit v1.2.3


From 6f9cb39e79ff97bcd5e0635cb67f9a8f23f2b486 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Tue, 2 Jul 2013 22:58:16 -0600
Subject: Change EIP switch label to "Encrypted Internet"

---
 res/layout/eip_service_fragment.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
index 885c78a3..e67f5651 100644
--- a/res/layout/eip_service_fragment.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -15,19 +15,6 @@
         android:clickable="true"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceLarge" />
-    
-    <TextView
-        android:id="@+id/eipType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/eipLabel"
-        android:layout_marginLeft="10dp"
-        android:layout_marginBottom="10dp"
-        android:layout_toRightOf="@+id/eipLabel"
-        android:clickable="true"
-        android:onClick="toggleEipOverview"
-        android:text="@string/eip_type_active"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <Switch
         android:id="@+id/eipSwitch"
@@ -54,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/eipType"
+        android:layout_below="@+id/eipLabel"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-- 
cgit v1.2.3


From 1faa1e6432b0b01fb129eb5d0ae057f5415673b6 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Fri, 12 Jul 2013 21:03:48 -0600
Subject: Include ics-openvpn license file in se.leap.openvpn package Clean
 erroneous copyright text (Consulted Arne) ics-openvpn uses GPLv2+

---
 res/layout/basic_settings.xml    | 15 ---------------
 res/layout/file_select.xml       | 16 ----------------
 res/layout/keystore_selector.xml | 16 ----------------
 res/layout/vpn_list_item.xml     | 16 ----------------
 4 files changed, 63 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index d56f6ad5..b71ae664 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:leap="http://schemas.android.com/apk/res/se.leap.leapclient"
     android:layout_width="wrap_content"
diff --git a/res/layout/file_select.xml b/res/layout/file_select.xml
index 0dd1abba..7cc84c40 100644
--- a/res/layout/file_select.xml
+++ b/res/layout/file_select.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <!-- A layout to select a certificate, akin to a file selector on web pages. -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml
index 211e977b..39b5d11b 100644
--- a/res/layout/keystore_selector.xml
+++ b/res/layout/keystore_selector.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <!-- A layout to select a certificate, akin to a file selector on web pages. -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml
index 16d7d5bd..40cfff4a 100644
--- a/res/layout/vpn_list_item.xml
+++ b/res/layout/vpn_list_item.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-- 
cgit v1.2.3