64 files changed, 192 insertions, 82 deletions
diff --git a/main/res/layout/about_changes_page.xml b/main/res/layout/about_changes_page.xml
index 544d338..355ce90 100644
--- a/main/res/layout/about_changes_page.xml
+++ b/main/res/layout/about_changes_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".AboutActivity$ChangeLogViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_contributors_page.xml b/main/res/layout/about_contributors_page.xml
index 9a0955e..844cb34 100644
--- a/main/res/layout/about_contributors_page.xml
+++ b/main/res/layout/about_contributors_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".AboutActivity$ContributorsViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_help_page.xml b/main/res/layout/about_help_page.xml
index 0439e22..8985ffa 100644
--- a/main/res/layout/about_help_page.xml
+++ b/main/res/layout/about_help_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".AboutActivity$HelpViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_license_page.xml b/main/res/layout/about_license_page.xml
index b33f0f9..e91adf1 100644
--- a/main/res/layout/about_license_page.xml
+++ b/main/res/layout/about_license_page.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".AboutActivity$LicenseViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_version_page.xml b/main/res/layout/about_version_page.xml
index 80630e4..2eeadcc 100644
--- a/main/res/layout/about_version_page.xml
+++ b/main/res/layout/about_version_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".AboutActivity$VersionViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml
index 4fbe53c..57d13f2 100644
--- a/main/res/layout/addresslist_activity.xml
+++ b/main/res/layout/addresslist_activity.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".AddressListActivity" >
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/addresslist_item.xml b/main/res/layout/addresslist_item.xml
index dac1768..aa04728 100644
--- a/main/res/layout/addresslist_item.xml
+++ b/main/res/layout/addresslist_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/button_map"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -9,7 +10,8 @@
     android:paddingBottom="7dip"
     android:paddingLeft="5dip"
     android:paddingRight="5dip"
-    android:paddingTop="7dip" >
+    android:paddingTop="7dip"
+    tools:context=".ui.AddressListAdapter" >
 
     <TextView
         android:id="@+id/label"
diff --git a/main/res/layout/attribute_image.xml b/main/res/layout/attribute_image.xml
index f68aef4..75eff6a 100644
--- a/main/res/layout/attribute_image.xml
+++ b/main/res/layout/attribute_image.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attribute_images"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content"
+    tools:context=".CacheDetailActivity$AttributeViewBuilder" >
 
     <ImageView
         android:id="@+id/attribute_image"
diff --git a/main/res/layout/authorization_activity.xml b/main/res/layout/authorization_activity.xml
index 2907286..6364ee2 100644
--- a/main/res/layout/authorization_activity.xml
+++ b/main/res/layout/authorization_activity.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".network.OAuthAuthorizationActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/cachedetail_activity.xml b/main/res/layout/cachedetail_activity.xml
index d197bcd..b2e16a0 100644
--- a/main/res/layout/cachedetail_activity.xml
+++ b/main/res/layout/cachedetail_activity.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".CacheDetailActivity" >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
diff --git a/main/res/layout/cachedetail_description_page.xml b/main/res/layout/cachedetail_description_page.xml
index dba6789..4fa342d 100644
--- a/main/res/layout/cachedetail_description_page.xml
+++ b/main/res/layout/cachedetail_description_page.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    tools:context=".CacheDetailActivity$DescriptionViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -134,6 +136,7 @@
                 android:id="@+id/edit_personalnote"
                 style="@style/button_small"
                 android:text="@string/cache_personal_note_edit" />
+
             <Button
                 android:id="@+id/upload_personalnote"
                 style="@style/button_small"
diff --git a/main/res/layout/cachedetail_details_page.xml b/main/res/layout/cachedetail_details_page.xml
index 7b67846..e8902fd 100644
--- a/main/res/layout/cachedetail_details_page.xml
+++ b/main/res/layout/cachedetail_details_page.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:scrollbars="none" >
+    android:scrollbars="none"
+    tools:context=".CacheDetailActivity$DetailsViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/cachedetail_images_page.xml b/main/res/layout/cachedetail_images_page.xml
index 2360dd0..cf26fe5 100644
--- a/main/res/layout/cachedetail_images_page.xml
+++ b/main/res/layout/cachedetail_images_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".CacheDetailActivity$ImagesViewCreator" >
 
     <LinearLayout
         android:id="@+id/spoiler_list"
diff --git a/main/res/layout/cachedetail_inventory_page.xml b/main/res/layout/cachedetail_inventory_page.xml
index a15cedd..c134a79 100644
--- a/main/res/layout/cachedetail_inventory_page.xml
+++ b/main/res/layout/cachedetail_inventory_page.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:cacheColorHint="?background_color"
     android:clipToPadding="false"
-    android:scrollbarStyle="outsideOverlay" >
+    android:scrollbarStyle="outsideOverlay"
+    tools:context=".CacheDetailActivity$InventoryViewCreator" >
 
 </ListView>
 \ No newline at end of file
diff --git a/main/res/layout/cachedetail_waypoints_footer.xml b/main/res/layout/cachedetail_waypoints_footer.xml
index 58187c1..440363b 100644
--- a/main/res/layout/cachedetail_waypoints_footer.xml
+++ b/main/res/layout/cachedetail_waypoints_footer.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/add_waypoint"
     style="@style/button_full"
     android:layout_margin="10dip"
-    android:padding="10dip"
     android:clickable="true"
-    android:text="@string/cache_waypoints_add" />
-
+    android:padding="10dip"
+    android:text="@string/cache_waypoints_add"
+    tools:context=".CacheDetailActivity$WaypointsViewCreator" />
diff --git a/main/res/layout/cachedetail_waypoints_page.xml b/main/res/layout/cachedetail_waypoints_page.xml
index 8111210..dbf896a 100644
--- a/main/res/layout/cachedetail_waypoints_page.xml
+++ b/main/res/layout/cachedetail_waypoints_page.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:cacheColorHint="?background_color"
@@ -11,6 +12,7 @@
     android:footerDividersEnabled="false"
     android:headerDividersEnabled="false"
     android:listSelector="?background_color"
-    android:scrollbarStyle="outsideOverlay" >
+    android:scrollbarStyle="outsideOverlay"
+    tools:context=".CacheDetailActivity$WaypointsViewCreator" >
 
 </ListView>
 \ No newline at end of file
diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml
index 58e070e..fce9b88 100644
--- a/main/res/layout/cachelist_spinneritem.xml
+++ b/main/res/layout/cachelist_spinneritem.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
+    style="?attr/spinnerDropDownItemStyle"
+    android:layout_width="match_parent"
     android:layout_height="?attr/dropdownListPreferredItemHeight"
-    android:minHeight="?attr/dropdownListPreferredItemHeight"
     android:layout_gravity="left|center_vertical"
-    style="?attr/spinnerDropDownItemStyle"
-    >
-
+    android:minHeight="?attr/dropdownListPreferredItemHeight"
+    android:orientation="vertical"
+    tools:context=".CacheListSpinnerAdapter" >
 
     <TextView
         android:id="@android:id/text1"
diff --git a/main/res/layout/cacheslist_activity.xml b/main/res/layout/cacheslist_activity.xml
index 561baa2..351543e 100644
--- a/main/res/layout/cacheslist_activity.xml
+++ b/main/res/layout/cacheslist_activity.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".CacheListActivity" >
 
     <include layout="@layout/filter_bar" />
 
diff --git a/main/res/layout/cacheslist_footer.xml b/main/res/layout/cacheslist_footer.xml
index ed2de18..ff323f4 100644
--- a/main/res/layout/cacheslist_footer.xml
+++ b/main/res/layout/cacheslist_footer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/more_caches"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -13,4 +14,5 @@
     android:singleLine="true"
     android:text="@string/caches_no_cache"
     android:textColor="@color/just_white"
-    android:textSize="16sp" />
+    android:textSize="16sp"
+    tools:context=".CacheListActivity" />
diff --git a/main/res/layout/cacheslist_item.xml b/main/res/layout/cacheslist_item.xml
index 260b0d0..efb622e 100644
--- a/main/res/layout/cacheslist_item.xml
+++ b/main/res/layout/cacheslist_item.xml
@@ -5,7 +5,8 @@
     android:id="@+id/one_cache"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="?background_color" >
+    android:background="?background_color"
+    tools:context=".ui.CacheListAdapter" >
 
     <!-- selection mode checkbox -->
 
diff --git a/main/res/layout/compass_activity.xml b/main/res/layout/compass_activity.xml
index ca61cc3..ab1fe6d 100644
--- a/main/res/layout/compass_activity.xml
+++ b/main/res/layout/compass_activity.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".CompassActivity" >
 
     <LinearLayout
         android:id="@+id/info1"
diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml
index 9b5cb8d..a12bedf 100644
--- a/main/res/layout/coordinatesinput_dialog.xml
+++ b/main/res/layout/coordinatesinput_dialog.xml
@@ -3,7 +3,8 @@
     android:id="@+id/scroller"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:fillViewport="true" >
+    android:fillViewport="true"
+    tools:context=".ui.dialog.CoordinatesInputDialog" >
 
     <LinearLayout
         android:id="@+id/scroller_child"
diff --git a/main/res/layout/editwaypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml
index c21e25d..3f19825 100644
--- a/main/res/layout/editwaypoint_activity.xml
+++ b/main/res/layout/editwaypoint_activity.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".EditWaypointActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/fieldnote_export_dialog.xml b/main/res/layout/fieldnote_export_dialog.xml
index 9859b0f..c76225c 100644
--- a/main/res/layout/fieldnote_export_dialog.xml
+++ b/main/res/layout/fieldnote_export_dialog.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical"
-    android:padding="3dip" >
+    android:padding="3dip"
+    tools:context=".export.FieldnoteExport" >
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml
index 1e9fbf9..893dc31 100644
--- a/main/res/layout/fragment_edit_note.xml
+++ b/main/res/layout/fragment_edit_note.xml
@@ -1,9 +1,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/edit_note"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".ui.EditNoteDialog" >
 
     <EditText
         android:id="@+id/note"
diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml
index 4367f82..e1d696d 100644
--- a/main/res/layout/gpx.xml
+++ b/main/res/layout/gpx.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".files.AbstractFileListActivity" >
 
     <Button
         android:id="@+id/select_dir"
diff --git a/main/res/layout/gpx_export_dialog.xml b/main/res/layout/gpx_export_dialog.xml
index 9c97848..02e9134 100644
--- a/main/res/layout/gpx_export_dialog.xml
+++ b/main/res/layout/gpx_export_dialog.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical"
-    android:padding="3dip" >
+    android:padding="3dip"
+    tools:context=".export.GpxExport" >
 
     <TextView
         android:id="@id/info"
diff --git a/main/res/layout/gpx_item.xml b/main/res/layout/gpx_item.xml
index f0a0647..372bb9a 100644
--- a/main/res/layout/gpx_item.xml
+++ b/main/res/layout/gpx_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/button_map"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -9,7 +10,8 @@
     android:paddingBottom="7dip"
     android:paddingLeft="5dip"
     android:paddingRight="5dip"
-    android:paddingTop="7dip" >
+    android:paddingTop="7dip"
+    tools:context=".ui.GPXListAdapter" >
 
     <TextView
         android:id="@+id/filepath"
diff --git a/main/res/layout/image_item.xml b/main/res/layout/image_item.xml
index 3478444..5eae256 100644
--- a/main/res/layout/image_item.xml
+++ b/main/res/layout/image_item.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/map_image"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:gravity="center" />
+    android:gravity="center"
+    tools:context=".ui.ImagesList" />
diff --git a/main/res/layout/images_activity.xml b/main/res/layout/images_activity.xml
index 861fa7e..d32e9e5 100644
--- a/main/res/layout/images_activity.xml
+++ b/main/res/layout/images_activity.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".ImagesActivity" >
 
     <include layout="@layout/cachedetail_images_page" />
 
diff --git a/main/res/layout/imageselect_activity.xml b/main/res/layout/imageselect_activity.xml
index 690baa2..0c74a18 100644
--- a/main/res/layout/imageselect_activity.xml
+++ b/main/res/layout/imageselect_activity.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".ImageSelectActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/internal_browser.xml b/main/res/layout/internal_browser.xml
index 1e09ee0..cf38076 100644
--- a/main/res/layout/internal_browser.xml
+++ b/main/res/layout/internal_browser.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activity.SimpleWebviewActivity" >
 
     <WebView
-            android:id="@+id/webview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
 </LinearLayout>
 \ No newline at end of file
diff --git a/main/res/layout/livemapinfo.xml b/main/res/layout/livemapinfo.xml
index 889febc..564ed00 100644
--- a/main/res/layout/livemapinfo.xml
+++ b/main/res/layout/livemapinfo.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/live_map_scroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".ui.dialog.LiveMapInfoDialogBuilder" >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -18,7 +20,6 @@
             android:text="@string/live_map_notification"
             android:textColor="?text_color"
             android:textSize="14sp" />
-
     </LinearLayout>
 
 </ScrollView>
 \ No newline at end of file
diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml
index b01ea74..2294fc7 100644
--- a/main/res/layout/logcache_activity.xml
+++ b/main/res/layout/logcache_activity.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
     android:orientation="vertical"
-    android:padding="4dip" xmlns:tools="http://schemas.android.com/tools">
+    android:padding="4dip"
+    tools:context=".LogCacheActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/logcache_trackable_item.xml b/main/res/layout/logcache_trackable_item.xml
index 1eab116..72082ac 100644
--- a/main/res/layout/logcache_trackable_item.xml
+++ b/main/res/layout/logcache_trackable_item.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="5dip"
     android:orientation="horizontal"
     android:paddingBottom="10dip"
     android:paddingLeft="10dip"
-    android:paddingRight="10dip" >
+    android:paddingRight="10dip"
+    tools:context=".LogCacheActivity" >
 
     <LinearLayout
         android:id="@+id/info"
diff --git a/main/res/layout/logs_item.xml b/main/res/layout/logs_item.xml
index 6ce20bb..b362d9e 100644
--- a/main/res/layout/logs_item.xml
+++ b/main/res/layout/logs_item.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="3dip"
-    android:paddingTop="3dip" >
+    android:paddingTop="3dip"
+    tools:context=".ui.logs.LogsViewCreator$1" >
 
     <TextView
         android:id="@+id/author"
diff --git a/main/res/layout/logs_page.xml b/main/res/layout/logs_page.xml
index 11f7855..e168be5 100644
--- a/main/res/layout/logs_page.xml
+++ b/main/res/layout/logs_page.xml
@@ -12,6 +12,7 @@
     android:headerDividersEnabled="false"
     android:listSelector="?background_color"
     android:scrollbarStyle="outsideOverlay"
+    tools:context=".ui.logs.LogsViewCreator"
     tools:listitem="@layout/logs_item" >
 
 </ListView>
 \ No newline at end of file
diff --git a/main/res/layout/logtrackable_activity.xml b/main/res/layout/logtrackable_activity.xml
index 2a901ea..dcd526b 100644
--- a/main/res/layout/logtrackable_activity.xml
+++ b/main/res/layout/logtrackable_activity.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".LogTrackableActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml
index d2bd025..474565f 100644
--- a/main/res/layout/main_activity.xml
+++ b/main/res/layout/main_activity.xml
@@ -4,7 +4,8 @@
     android:id="@+id/mainscreen"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_gravity="center" >
+    android:layout_gravity="center"
+    tools:context=".MainActivity" >
 
     <fragment
         android:id="@+id/status"
diff --git a/main/res/layout/main_activity_connectorstatus.xml b/main/res/layout/main_activity_connectorstatus.xml
index 33c4d79..6c334aa 100644
--- a/main/res/layout/main_activity_connectorstatus.xml
+++ b/main/res/layout/main_activity_connectorstatus.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/location_current"
-    android:text="@string/init_login_popup_working" />
+    android:text="@string/init_login_popup_working"
+    tools:context=".MainActivity$1" />
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 85f550a..85fee7a 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-
+    android:orientation="vertical"
+    tools:context=".maps.google.v1.GoogleMapProvider" >
 
     <include layout="@layout/actionbar_maps" />
 
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index c44a3ee..a559545 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".maps.mapsforge.MapsforgeMapProvider" >
 
     <include layout="@layout/actionbar_maps" />
 
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index daa5f74..9ed6596 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".maps.mapsforge.MapsforgeMapProvider" >
 
     <include layout="@layout/actionbar_maps" />
 
diff --git a/main/res/layout/mapfile_item.xml b/main/res/layout/mapfile_item.xml
index c665894..dd17f69 100644
--- a/main/res/layout/mapfile_item.xml
+++ b/main/res/layout/mapfile_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mapfile_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -9,7 +10,8 @@
     android:paddingBottom="7dip"
     android:paddingLeft="5dip"
     android:paddingRight="5dip"
-    android:paddingTop="7dip" >
+    android:paddingTop="7dip"
+    tools:context=".ui.FileSelectionListAdapter" >
 
     <TextView
         android:id="@+id/mapfilepath"
diff --git a/main/res/layout/navigateanypoint_activity.xml b/main/res/layout/navigateanypoint_activity.xml
index 3305d56..caec2f4 100644
--- a/main/res/layout/navigateanypoint_activity.xml
+++ b/main/res/layout/navigateanypoint_activity.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".NavigateAnyPointActivity" >
 
     <ListView
         android:id="@+id/historyList"
diff --git a/main/res/layout/navigateanypoint_header.xml b/main/res/layout/navigateanypoint_header.xml
index caf2e48..05d3ed0 100644
--- a/main/res/layout/navigateanypoint_header.xml
+++ b/main/res/layout/navigateanypoint_header.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:weightSum="1" >
+    android:weightSum="1"
+    tools:context=".NavigateAnyPointActivity" >
 
     <RelativeLayout style="@style/separator_horizontal_layout" >
 
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index de94d18..436c7d8 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:background="?background_color_transparent"
     android:orientation="vertical"
-    tools:context=".CachePopup">
+    tools:context=".CachePopupFragment" >
 
     <include layout="@layout/actionbar_popup" />
     <ScrollView
diff --git a/main/res/layout/preference_info_icon.xml b/main/res/layout/preference_info_icon.xml
index 4de0a15..597e400 100644
--- a/main/res/layout/preference_info_icon.xml
+++ b/main/res/layout/preference_info_icon.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView 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:src="?attr/settings_info_icon" />
+    android:layout_height="match_parent"
+    android:src="?attr/settings_info_icon"
+    tools:context=".settings.InfoPreference" />
diff --git a/main/res/layout/recaptcha_dialog.xml b/main/res/layout/recaptcha_dialog.xml
index 66ad4ef..9c95813 100644
--- a/main/res/layout/recaptcha_dialog.xml
+++ b/main/res/layout/recaptcha_dialog.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".connector.gc.RecaptchaHandler" >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -27,7 +29,6 @@
             android:layout_gravity="center_vertical"
             android:scaleType="centerInside"
             android:src="@drawable/ic_menu_refresh" />
-
     </LinearLayout>
 
     <EditText
diff --git a/main/res/layout/search_activity.xml b/main/res/layout/search_activity.xml
index 894c461..902c707 100644
--- a/main/res/layout/search_activity.xml
+++ b/main/res/layout/search_activity.xml
@@ -5,7 +5,8 @@
     android:layout_height="fill_parent"
     android:background="?background_color"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".SearchActivity" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml
index 167b2ec..300579d 100644
--- a/main/res/layout/simple_dir_chooser.xml
+++ b/main/res/layout/simple_dir_chooser.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".files.SimpleDirChooser" >
 
     <LinearLayout
         android:id="@+id/headerLayout"
diff --git a/main/res/layout/simple_dir_item.xml b/main/res/layout/simple_dir_item.xml
index e268943..2abce4c 100644
--- a/main/res/layout/simple_dir_item.xml
+++ b/main/res/layout/simple_dir_item.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
+    tools:context=".files.SimpleDirChooser" >
 
     <CheckBox
         android:id="@+id/CheckBox"
diff --git a/main/res/layout/simple_way_point.xml b/main/res/layout/simple_way_point.xml
index 88f76e7..333bb9d 100644
--- a/main/res/layout/simple_way_point.xml
+++ b/main/res/layout/simple_way_point.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linearLayout1"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content"
+    tools:context=".NavigateAnyPointActivity$DestinationHistoryAdapter" >
 
     <ImageView
         android:id="@+id/imageView1"
diff --git a/main/res/layout/star_image.xml b/main/res/layout/star_image.xml
index 919fedb..809a17d 100644
--- a/main/res/layout/star_image.xml
+++ b/main/res/layout/star_image.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="12dip"
     android:layout_height="12dip"
     android:layout_gravity="center"
     android:layout_margin="1dip"
     android:gravity="center"
     android:scaleType="fitXY"
-    android:src="@drawable/star_off" />
+    android:src="@drawable/star_off"
+    tools:context=".ui.CacheDetailsCreator" />
diff --git a/main/res/layout/staticmaps_activity.xml b/main/res/layout/staticmaps_activity.xml
index c8806b4..3ca336e 100644
--- a/main/res/layout/staticmaps_activity.xml
+++ b/main/res/layout/staticmaps_activity.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".StaticMapsActivity" >
 
     <LinearLayout
         android:id="@+id/maps_list"
diff --git a/main/res/layout/staticmaps_activity_item.xml b/main/res/layout/staticmaps_activity_item.xml
index 6b76192..8600246 100644
--- a/main/res/layout/staticmaps_activity_item.xml
+++ b/main/res/layout/staticmaps_activity_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/map_image"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -7,4 +8,5 @@
     android:layout_marginBottom="10dip"
     android:gravity="center"
     android:padding="3dip"
-    android:scaleType="fitCenter" />
+    android:scaleType="fitCenter"
+    tools:context=".StaticMapsActivity" />
diff --git a/main/res/layout/status.xml b/main/res/layout/status.xml
index ef2a57a..76f9a8d 100644
--- a/main/res/layout/status.xml
+++ b/main/res/layout/status.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/status"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/helper_bcg"
-    android:visibility="invisible" >
+    android:visibility="invisible"
+    tools:context=".StatusFragment" >
 
     <ImageView
         android:id="@+id/status_icon"
diff --git a/main/res/layout/template_preference_dialog.xml b/main/res/layout/template_preference_dialog.xml
index c5fc548..343cc5f 100644
--- a/main/res/layout/template_preference_dialog.xml
+++ b/main/res/layout/template_preference_dialog.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="8dp" >
+    android:padding="8dp"
+    tools:context=".settings.TemplateTextPreference" >
 
     <EditText
         android:id="@+id/signature_dialog_text"
diff --git a/main/res/layout/trackable_details_view.xml b/main/res/layout/trackable_details_view.xml
index 07f4e4e..e2c162e 100644
--- a/main/res/layout/trackable_details_view.xml
+++ b/main/res/layout/trackable_details_view.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip" >
+    android:padding="4dip"
+    tools:context=".TrackableActivity$DetailsViewCreator" >
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/trackable_image.xml b/main/res/layout/trackable_image.xml
index 89955bc..8a55cb7 100644
--- a/main/res/layout/trackable_image.xml
+++ b/main/res/layout/trackable_image.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/trackable_image"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:layout_marginBottom="3dip"
     android:gravity="center"
-    android:scaleType="center" />
+    android:scaleType="center"
+    tools:context=".TrackableActivity$DetailsViewCreator" />
diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml
index 7abb212..8ecea23 100644
--- a/main/res/layout/usefulapps_activity.xml
+++ b/main/res/layout/usefulapps_activity.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".UsefulAppsActivity" >
 
     <ListView
         android:id="@+id/apps_list"
diff --git a/main/res/layout/usefulapps_item.xml b/main/res/layout/usefulapps_item.xml
index 70e7baf..8cb2511 100644
--- a/main/res/layout/usefulapps_item.xml
+++ b/main/res/layout/usefulapps_item.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/app_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_marginBottom="10dip"
     android:descendantFocusability="blocksDescendants"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".UsefulAppsActivity" >
 
     <RelativeLayout style="@style/separator_horizontal_layout" >
 
diff --git a/main/res/layout/waypoint_item.xml b/main/res/layout/waypoint_item.xml
index 4fe3576..51c57c5 100644
--- a/main/res/layout/waypoint_item.xml
+++ b/main/res/layout/waypoint_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/waypoint"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -7,7 +8,8 @@
     android:descendantFocusability="blocksDescendants"
     android:longClickable="true"
     android:orientation="vertical"
-    android:paddingTop="9dp" >
+    android:paddingTop="9dp"
+    tools:context=".CacheDetailActivity$WaypointsViewCreator$1" >
 
     <RelativeLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index 287fc3a..9a566ee 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?background_color_transparent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context=".WaypointPopupFragment" >
 
-     <include layout="@layout/actionbar_popup" />
+    <include layout="@layout/actionbar_popup" />
 
     <ScrollView
         android:id="@+id/details_list_box"