From 3f89d6f85b5dfdbe3d6dbf211a5844e2b49fcf66 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <tim@bandenkrieg.hacked.jp>
Date: Sun, 25 Jan 2015 19:32:10 +0100
Subject: [PATCH] =?UTF-8?q?Unn=C3=B6tiges=20Zeug=20entfernen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_main.xml | 25 +++++++++++------------
 app/src/main/res/values/strings.xml       |  5 -----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 211f506..2ebe490 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,17 +1,18 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity$PlaceholderFragment">
+    tools:context=".MainActivity$PlaceholderFragment"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentLeft="true">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true">
 
         <Switch
             android:layout_width="match_parent"
@@ -57,6 +58,4 @@
                 android:enabled="false" />
         </LinearLayout>
 
-    </LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 579de4e..4ee4baa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,14 +2,9 @@
 <resources>
 
     <string name="app_name">Türöffner</string>
-    <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
-    <string name="unlock_door">Sesam öffne dich</string>
-    <string name="button_wlan">✘ WLAN</string>
     <string name="button_outer_door">Buzzer</string>
     <string name="button_inner_door">Aufschliesen</string>
-    <string name="button_wlan_connected">✓ WLAN</string>
-    <string name="could_not_connect">Konnte nicht zum WLAN „Krautspace“ verbinden.</string>
     <string name="door_key">DoorKey</string>
     <string name="wlan_switcher">Tür WLAN aktivieren</string>
     <string name="button_inner_door_open">Öffnen</string>