From fb10557897af3254708d928d3fad19dd20db14af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 13 Feb 2012 20:30:38 +0100
Subject: Fix focus problem.

---
 same-android/res/layout/controller.xml                            | 6 ++++--
 same-android/src/main/java/com/orbekk/SameControllerActivity.java | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'same-android')

diff --git a/same-android/res/layout/controller.xml b/same-android/res/layout/controller.xml
index a85cacd..ad4c286 100644
--- a/same-android/res/layout/controller.xml
+++ b/same-android/res/layout/controller.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >
+    android:orientation="vertical"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:id="@+id/container_layout">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
index 4fb1424..cbc73e4 100644
--- a/same-android/src/main/java/com/orbekk/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
@@ -110,9 +110,10 @@ public class SameControllerActivity extends Activity {
         showIpAddress();
     }
     
-    @Override public void onStart() {
+    @Override public void onResume() {
         super.onResume();
         
+        TextView tv = new TextView(this);
         Intent intent = new Intent(this, SameService.class);
         bindService(intent, sameConnection, Context.BIND_AUTO_CREATE);
         
-- 
cgit v1.2.3