aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/layout
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-05-10 09:27:06 +0200
committerBananeweizen <bananeweizen@gmx.de>2013-05-10 09:27:06 +0200
commit0e713f01ac7f119e450743c817e863bbd4a24fea (patch)
tree90f6c384f749866241e4a3cdda0bf0aa7973dedc /main/res/layout
parentd6e525eeba8fbd066138a9d6b98bb5683c18f449 (diff)
downloadcgeo-0e713f01ac7f119e450743c817e863bbd4a24fea.zip
cgeo-0e713f01ac7f119e450743c817e863bbd4a24fea.tar.gz
cgeo-0e713f01ac7f119e450743c817e863bbd4a24fea.tar.bz2
fix exception in coords dialog
* introduced in d1acac75b6af3239701a2df020488db2af2dcb05
Diffstat (limited to 'main/res/layout')
-rw-r--r--main/res/layout/actionbar_title_no_home.xml10
-rw-r--r--main/res/layout/coords.xml5
-rw-r--r--main/res/layout/popup.xml4
-rw-r--r--main/res/layout/waypoint_popup.xml4
4 files changed, 16 insertions, 7 deletions
diff --git a/main/res/layout/actionbar_title_no_home.xml b/main/res/layout/actionbar_title_no_home.xml
new file mode 100644
index 0000000..6295bdc
--- /dev/null
+++ b/main/res/layout/actionbar_title_no_home.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <TextView
+ android:id="@+id/actionbar_title"
+ style="@style/action_bar_title" />
+
+</merge> \ No newline at end of file
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index 6da453e..70cce5a 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,7 +5,10 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
- <include layout="@layout/actionbar" />
+ <LinearLayout style="@style/action_bar" >
+
+ <include layout="@layout/actionbar_title_no_home" />
+ </LinearLayout>
<ScrollView
android:id="@+id/scroller"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 15e4248..05bcbfe 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -7,9 +7,7 @@
<LinearLayout style="@style/action_bar" >
- <TextView
- android:id="@+id/actionbar_title"
- style="@style/action_bar_title" />
+ <include layout="@layout/actionbar_title_no_home" />
<include layout="@layout/actionbar_button_compass" />
</LinearLayout>
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index b3806aa..c8b257c 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -7,9 +7,7 @@
<LinearLayout style="@style/action_bar" >
- <TextView
- android:id="@+id/actionbar_title"
- style="@style/action_bar_title" />
+ <include layout="@layout/actionbar_title_no_home" />
<include layout="@layout/actionbar_button_compass" />
</LinearLayout>