From 263967cbb477983ae8680b431c1d93f102971c30 Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Sun, 25 Aug 2013 21:05:00 +0800
Subject: restructured the project

---
 res/layout/activity_gather.xml   |  23 ------
 res/layout/activity_init.xml     |  16 -----
 res/layout/activity_login.xml    |  92 ------------------------
 res/layout/activity_main.xml     |  23 ------
 res/layout/activity_settings.xml | 149 ---------------------------------------
 res/layout/gather_footbar.xml    | 133 ----------------------------------
 res/layout/gather_timer.xml      |  16 -----
 res/layout/login_bottom.xml      |  13 ----
 res/layout/main_footbar.xml      | 107 ----------------------------
 res/layout/main_headbar.xml      |  29 --------
 res/layout/settings_headbar.xml  |  29 --------
 11 files changed, 630 deletions(-)
 delete mode 100644 res/layout/activity_gather.xml
 delete mode 100644 res/layout/activity_init.xml
 delete mode 100644 res/layout/activity_login.xml
 delete mode 100644 res/layout/activity_main.xml
 delete mode 100644 res/layout/activity_settings.xml
 delete mode 100644 res/layout/gather_footbar.xml
 delete mode 100644 res/layout/gather_timer.xml
 delete mode 100644 res/layout/login_bottom.xml
 delete mode 100644 res/layout/main_footbar.xml
 delete mode 100644 res/layout/main_headbar.xml
 delete mode 100644 res/layout/settings_headbar.xml

(limited to 'res/layout')

diff --git a/res/layout/activity_gather.xml b/res/layout/activity_gather.xml
deleted file mode 100644
index f887cf0..0000000
--- a/res/layout/activity_gather.xml
+++ /dev/null
@@ -1,23 +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:background="@android:color/white"
-	android:orientation="vertical">
-	<RelativeLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:id="@+id/gather_timer_layout"
-		>
-		<include layout="@layout/gather_timer"/>
-	</RelativeLayout>
-	<LinearLayout
-		android:id="@+id/gather_footbar_layout" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		>
-		<include layout="@layout/gather_footbar"></include>
-	</LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/activity_init.xml b/res/layout/activity_init.xml
deleted file mode 100644
index 43e6253..0000000
--- a/res/layout/activity_init.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".InitAct" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
-
-</RelativeLayout>
diff --git a/res/layout/activity_login.xml b/res/layout/activity_login.xml
deleted file mode 100644
index cd2d34c..0000000
--- a/res/layout/activity_login.xml
+++ /dev/null
@@ -1,92 +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="fill_parent"
-	android:background="@android:color/black"
-	android:orientation="vertical">
-	
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-    
-    <ImageView
-        android:id="@+id/main_headbar_img"
-        android:layout_width="180dp"
-        android:layout_height="240dp"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/title_logo" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" 
-        android:layout_gravity="center">
-
-        <TableLayout 
-            android:layout_width="match_parent" 
-            android:layout_height="wrap_content">
-
-            <TableRow 
-                android:layout_marginBottom="15dp"
-                android:layout_marginTop="15dp">
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content" 
-                    android:layout_weight="0.25"
-                    android:gravity="right" 
-                    android:id="@+id/user_id_text" 
-                    android:text="User ID" 
-                    android:textColor="@android:color/white"
-                     />
-
-                <EditText  
-                    android:layout_width="0dp"
-                                android:layout_weight="0.75"
-                    android:id="@+id/user_id"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-                    <requestFocus/>
-            </TableRow>
-
-            <TableRow>
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.25" 
-                    android:gravity="right" 
-                    android:id="@+id/user_pass_text" 
-                    android:text="Password" 
-                    android:textColor="@android:color/black"
-                />
-
-                <EditText  
-                    android:layout_width="0dp" 
-                    android:layout_weight="0.75"
-                    android:id="@+id/user_pass"           
-                    android:password="true"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-             </TableRow>     
-        </TableLayout>
-    </LinearLayout>
-	
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        >
-    <Button
-        android:id="@+id/login_btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Login"
-        android:textColor="@android:color/white" />
-    </LinearLayout>
-
-</LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
deleted file mode 100644
index b2b61ac..0000000
--- a/res/layout/activity_main.xml
+++ /dev/null
@@ -1,23 +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:background="@android:color/white"
-	android:orientation="vertical">
-	<RelativeLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:id="@+id/main_headbar_layout"
-		>
-		<include layout="@layout/main_headbar"/>
-	</RelativeLayout>
-	<LinearLayout
-		android:id="@+id/main_footbar_layout" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		>
-		<include layout="@layout/main_footbar"/>
-	</LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
deleted file mode 100644
index 8ce051f..0000000
--- a/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:background="@drawable/topbar_background"
-	android:orientation="horizontal" >
-
-	<RelativeLayout
-		android:id="@+id/settings_headbar_layout"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true" >
-
-		<include layout="@layout/settings_headbar" />
-	</RelativeLayout>
-
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_marginTop="48dip"
-		android:orientation="vertical" >
-
-		<TextView
-			android:id="@+id/settings_GPSrefreshrate_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="GPS refresh rate"
-			android:layout_gravity="center"
-			android:layout_marginTop="10dip"
-			android:textSize="20dip"
-			android:textColor="@android:color/white" />
-
-		<SeekBar
-			android:id="@+id/settings_GPSrefreshrate"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
-
-		<!-- LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			-->
-			<!-- TextView 
-				android:id="@+id/GPS_min_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="10dip"
-				android:text="1s"
-				android:textSize="10dip"
-				android:textColor="@android:color/white"/-->
-
-			<!--TextView
-			android:id="@+id/GPS_max_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:text="30s"
-			android:textColor="@android:color/white"
-			android:textSize="10dip" /-->
-
-			<!-- /LinearLayout --> <!-- end of gps text -->
-
-		<ImageView
-		    android:id="@+id/settings_seperator1"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_sex_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_sex_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_sex" />
-
-			<CheckBox
-			    android:id="@+id/settings_show_male"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/male" 
-			    android:textColor="@android:color/white"/>
-			
-
-			<CheckBox
-			    android:id="@+id/settings_show_female"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/female" 
-			    android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator2"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_team_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_team_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_team" />
-
-			<RadioButton
-			    android:id="@+id/settings_team_mine"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/mine" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-			<RadioButton
-			    android:id="@+id/settings_team_all"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/all" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator3"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		</LinearLayout>
-	</RelativeLayout>
diff --git a/res/layout/gather_footbar.xml b/res/layout/gather_footbar.xml
deleted file mode 100644
index e573032..0000000
--- a/res/layout/gather_footbar.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_search_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_search_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_search_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/search"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_fetch_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_fetch_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_fetch_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/fetch"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_checkin_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:layout_weight="1"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:orientation="vertical">
-		<ImageButton 
-			android:id="@+id/footbar_btn_checkin"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_checkin_style"
-			/>
-		<TextView 
-			android:id="@+id/footbar_btn_checkin_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/checkin"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_focus_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_focus_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_focus_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/focus"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_settings_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_settings_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:text="@string/settings"/>
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/gather_timer.xml b/res/layout/gather_timer.xml
deleted file mode 100644
index 3849f6b..0000000
--- a/res/layout/gather_timer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:background="@android:color/black"
-	android:id="@+id/gather_timer_layout" >
-
-	<TextView
-		android:id="@+id/gather_timer"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:textSize="40dip"
-		android:textColor="@android:color/white">
-	</TextView>
-</RelativeLayout>
diff --git a/res/layout/login_bottom.xml b/res/layout/login_bottom.xml
deleted file mode 100644
index e268c39..0000000
--- a/res/layout/login_bottom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="200dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-    <ImageView 
-        android:layout_width="fill_parent"
-        android:layout_height="120dip"
-        android:src="@drawable/bottom_img"/>
-
-</LinearLayout>
diff --git a/res/layout/main_footbar.xml b/res/layout/main_footbar.xml
deleted file mode 100644
index 69760c0..0000000
--- a/res/layout/main_footbar.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_search_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_search_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/search"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_fetch_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_fetch_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_fetch_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/fetch"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_focus_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_focus_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_focus_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/focus"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_settings_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_settings_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_settings_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:text="@string/settings"/>
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/main_headbar.xml b/res/layout/main_headbar.xml
deleted file mode 100644
index 137e3a1..0000000
--- a/res/layout/main_headbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="40dip"
-	android:background="@drawable/topbar_background"
-	android:id="@+id/main_headbar_layout" >
-
-	<ImageView 
-		android:id="@+id/headbar_logo"
-		android:layout_width="34dip"
-		android:layout_height="34dip"
-		android:layout_alignParentLeft="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="5dip"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/title_logo"/>
-
-	<TextView
-		android:id="@+id/headbar_appname"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="8dip"
-		android:textSize="26dip"
-		android:textColor="@android:color/white"
-		android:layout_toRightOf="@+id/headbar_logo"
-		android:text="@string/app_name" />
-
-</RelativeLayout>
diff --git a/res/layout/settings_headbar.xml b/res/layout/settings_headbar.xml
deleted file mode 100644
index 9065bdb..0000000
--- a/res/layout/settings_headbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="48dip"
-    android:background="@drawable/topbar_background"
-    android:id="@+id/settings_headbar_layout" >
-
-	<ImageButton 
-        android:id="@+id/settings_btn_back"
-        android:layout_width="40dip"
-        android:layout_height="40dip"
-        android:layout_marginLeft="5dip"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:background="@drawable/navigation_back"/>
-	
-    <TextView 
-        android:id="@+id/settings_headbar_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="30dip"
-        android:textColor="@android:color/white"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="40dip"
-        android:text="@string/settings"/>
-    
-
-</RelativeLayout>
-- 
cgit v1.2.3-70-g09d2