From dd9c8a6b22d9ef11c11a6e38de82d80657258b9e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 29 Nov 2013 19:15:36 +0100
Subject: Fixes for keyboard navigation

---
 res/layout/vpn_list_item.xml    | 13 +++++++++----
 res/layout/vpn_profile_list.xml |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml
index 52db8ff6..ae9350fa 100644
--- a/res/layout/vpn_list_item.xml
+++ b/res/layout/vpn_list_item.xml
@@ -16,10 +16,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:focusable="false">
 
     <LinearLayout
         android:id="@+id/vpn_list_item_left"
@@ -27,7 +29,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:background="?android:attr/selectableItemBackground"
-        android:gravity="center_vertical" >
+        android:gravity="center_vertical"
+        android:focusable="true">
 
         <LinearLayout
             android:id="@android:id/widget_frame"
@@ -38,6 +41,7 @@
 
                <TextView
                 android:id="@+id/vpn_item_title"
+                tools:text="Vpn Name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="marquee"
@@ -64,6 +68,7 @@
         android:contentDescription="@string/configure_the_vpn"
         android:paddingLeft="15dip"
         android:paddingRight="?android:attr/scrollbarSize"
-        android:src="@drawable/ic_sysbar_quicksettings" />
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:focusable="true"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/vpn_profile_list.xml b/res/layout/vpn_profile_list.xml
index 870c0431..004c4638 100644
--- a/res/layout/vpn_profile_list.xml
+++ b/res/layout/vpn_profile_list.xml
@@ -8,6 +8,7 @@
     android:paddingRight="@dimen/stdpadding" >
 
     <ListView
+        android:descendantFocusability="afterDescendants"
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
-- 
cgit v1.2.3