From 17c883cbcc92b0bd19909ae676e5c7fa83d39de5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 4 May 2012 22:28:20 +0200
Subject: Version 0.4.7 :)

---
 res/layout/vpn_list_item.xml         |  5 +-
 res/layout/vpn_preference_layout.xml | 94 ------------------------------------
 2 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 res/layout/vpn_preference_layout.xml

(limited to 'res')

diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml
index dc6254e5..75da3cf5 100644
--- a/res/layout/vpn_list_item.xml
+++ b/res/layout/vpn_list_item.xml
@@ -19,11 +19,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:focusable="false"
     android:minHeight="?android:attr/listPreferredItemHeight" >
 
     <LinearLayout
-        android:id="@+id/vpnconfig_pref"
+        android:id="@+id/vpn_list_item_left"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_weight="1"
@@ -52,6 +51,7 @@
         android:layout_width="2dip"
         android:layout_height="match_parent"
         android:layout_marginBottom="5dip"
+        android:focusable="false"
         android:layout_marginTop="5dip"
         android:background="@android:drawable/divider_horizontal_dark" />
 
@@ -60,7 +60,6 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:layout_gravity="center"
-        android:focusable="true"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/configure_the_vpn"
         android:paddingLeft="15dip"
diff --git a/res/layout/vpn_preference_layout.xml b/res/layout/vpn_preference_layout.xml
deleted file mode 100644
index fbb18115..00000000
--- a/res/layout/vpn_preference_layout.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
-
-    <LinearLayout
-        android:id="@+id/vpnconfig_pref"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical" >
-
-        <LinearLayout
-            android:id="@android:id/widget_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical" />
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dip"
-            android:layout_marginRight="6dip"
-            android:layout_marginTop="6dip"
-            android:layout_weight="1" >
-
-            <TextView
-                android:id="@+android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@android:id/title"
-                android:layout_below="@android:id/title"
-                android:focusable="false"
-                android:maxLines="4"
-                android:paddingBottom="3dip"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="13sp"
-                android:visibility="gone" />
-        </RelativeLayout>
-    </LinearLayout>
-
-    <View
-        android:layout_width="2dip"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="5dip"
-        android:layout_marginTop="5dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
-
-    <ImageView
-        android:id="@+id/quickedit_settings"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:contentDescription="@string/configure_the_vpn"
-        android:focusable="true"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
-        android:src="@drawable/ic_sysbar_quicksettings" />
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3