From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 7 Apr 2014 20:43:34 +0200
Subject: Next step: compile jni sources correctly.

---
 res/layout/about.xml                         | 122 ---------------------------
 res/layout/client_dashboard.xml              |  67 ---------------
 res/layout/configuration_wizard_activity.xml |  26 ------
 res/layout/eip_service_fragment.xml          |  71 ----------------
 res/layout/log_in_dialog.xml                 |  41 ---------
 res/layout/logwindow.xml                     |  17 ----
 res/layout/new_provider_dialog.xml           |  24 ------
 res/layout/provider_detail_fragment.xml      |  40 ---------
 res/layout/provider_list_fragment.xml        |  15 ----
 res/layout/provider_list_item.xml            |  43 ----------
 10 files changed, 466 deletions(-)
 delete mode 100644 res/layout/about.xml
 delete mode 100644 res/layout/client_dashboard.xml
 delete mode 100644 res/layout/configuration_wizard_activity.xml
 delete mode 100644 res/layout/eip_service_fragment.xml
 delete mode 100644 res/layout/log_in_dialog.xml
 delete mode 100644 res/layout/logwindow.xml
 delete mode 100644 res/layout/new_provider_dialog.xml
 delete mode 100644 res/layout/provider_detail_fragment.xml
 delete mode 100644 res/layout/provider_list_fragment.xml
 delete mode 100644 res/layout/provider_list_item.xml

(limited to 'res/layout')

diff --git a/res/layout/about.xml b/res/layout/about.xml
deleted file mode 100644
index 4b3f16e0..00000000
--- a/res/layout/about.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<ScrollView 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"
-    android:layout_marginLeft="8sp"
-    tools:context=".Dashboard" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/copyright_leapgui" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/repository_url_text" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/translation_project_text" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/translationby" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_others" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/openvpn"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-        <!--
-         ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/openvpn_logo_descr"
-        android:src="@drawable/openvpnLogo" />
-        -->
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/opevpn_copyright" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/lzo"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/lzo_copyright" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/openssl"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_openssl" />
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
deleted file mode 100644
index a5387efd..00000000
--- a/res/layout/client_dashboard.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<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:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="?android:attr/selectableItemBackground" >
-    
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingLeft="10dp" >
-
-            <TextView
-                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: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>
-
-    <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" >
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/configuration_wizard_activity.xml b/res/layout/configuration_wizard_activity.xml
deleted file mode 100644
index f3d0e48b..00000000
--- a/res/layout/configuration_wizard_activity.xml
+++ /dev/null
@@ -1,26 +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" >
-
-    <ProgressBar
-        android:id="@+id/progressbar_configuration_wizard"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:max="3" />
-    
-    <TextView
-        android:id="@+id/progressbar_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:text="@string/configuring_provider"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_centerHorizontal="true"
-        android:textColor="@android:color/holo_blue_bright" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
deleted file mode 100644
index 5992a873..00000000
--- a/res/layout/eip_service_fragment.xml
+++ /dev/null
@@ -1,71 +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="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" />
-
-    <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" />
-    
-    <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"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/eipLabel"
-        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/status_unknown" />
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
deleted file mode 100644
index c8a2f0a8..00000000
--- a/res/layout/log_in_dialog.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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" >
-
-    <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"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginTop="16dp"
-        android:textSize="24sp"
-        android:ems="10"
-        android:hint="@string/username_hint"
-        android:inputType="textUri" >
-
-        <requestFocus />
-    </EditText>
-
-    <EditText
-        android:id="@+id/password_entered"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:ems="10"
-        android:hint="@string/password_hint"
-        android:inputType="textPassword" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/logwindow.xml b/res/layout/logwindow.xml
deleted file mode 100644
index 4051c92c..00000000
--- a/res/layout/logwindow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:text="@string/speed_waiting"
-        android:singleLine="true"
-        android:id="@+id/speed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-  <ListView
-            android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/new_provider_dialog.xml b/res/layout/new_provider_dialog.xml
deleted file mode 100644
index 19b8f442..00000000
--- a/res/layout/new_provider_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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" />
-
-    <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
diff --git a/res/layout/provider_detail_fragment.xml b/res/layout/provider_detail_fragment.xml
deleted file mode 100644
index eb90fad9..00000000
--- a/res/layout/provider_detail_fragment.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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
diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
deleted file mode 100644
index 70dbae0d..00000000
--- a/res/layout/provider_list_fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp" >
-
-    <ListView
-        android:id="@id/android:list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:drawSelectorOnTop="false" />
-
-</LinearLayout>
diff --git a/res/layout/provider_list_item.xml b/res/layout/provider_list_item.xml
deleted file mode 100644
index 8746f6f8..00000000
--- a/res/layout/provider_list_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingTop="2dip"
-    android:paddingBottom="2dip"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:mode="twoLine"
->
-
-    <TextView android:id="@android:id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginTop="6dip"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-    />
-
-    <TextView android:id="@android:id/text2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@android:id/text1"
-        android:layout_alignLeft="@android:id/text1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-    />
-
-</TwoLineListItem>
-- 
cgit v1.2.3