From 147d044dcf2a2907998f91fe35805ab81cb71e86 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 15 May 2013 12:45:36 +0100
Subject: [PATCH] Don't use the term widget, it has a specific meaning on
 Android.

---
 .../src/net/sf/briar/android/HomeScreenActivity.java |  4 ++--
 .../src/net/sf/briar/android/SetupActivity.java      |  4 ++--
 .../net/sf/briar/android/SplashScreenActivity.java   |  2 +-
 .../src/net/sf/briar/android/blogs/BlogActivity.java |  8 ++++----
 .../src/net/sf/briar/android/blogs/BlogAdapter.java  |  4 ++--
 .../net/sf/briar/android/blogs/BlogListActivity.java | 12 ++++++------
 .../net/sf/briar/android/blogs/BlogListAdapter.java  |  4 ++--
 .../briar/android/blogs/ConfigureBlogActivity.java   |  4 ++--
 .../sf/briar/android/blogs/CreateBlogActivity.java   |  4 ++--
 .../sf/briar/android/blogs/ManageBlogsActivity.java  |  4 ++--
 .../sf/briar/android/blogs/ReadBlogPostActivity.java | 10 +++++-----
 .../briar/android/blogs/WriteBlogPostActivity.java   |  4 ++--
 .../briar/android/contact/ContactListActivity.java   | 12 ++++++------
 .../sf/briar/android/contact/ContactListAdapter.java |  2 +-
 .../briar/android/groups/ConfigureGroupActivity.java |  4 ++--
 .../sf/briar/android/groups/CreateGroupActivity.java |  4 ++--
 .../net/sf/briar/android/groups/GroupActivity.java   |  8 ++++----
 .../net/sf/briar/android/groups/GroupAdapter.java    |  4 ++--
 .../sf/briar/android/groups/GroupListActivity.java   | 12 ++++++------
 .../sf/briar/android/groups/GroupListAdapter.java    |  4 ++--
 .../briar/android/groups/ManageGroupsActivity.java   |  4 ++--
 .../briar/android/groups/ReadGroupPostActivity.java  | 10 +++++-----
 .../briar/android/groups/WriteGroupPostActivity.java |  4 ++--
 .../android/identity/CreateIdentityActivity.java     |  4 ++--
 .../sf/briar/android/invitation/AddContactView.java  |  2 +-
 ...BluetoothWidget.java => BluetoothStatusView.java} |  7 ++++---
 .../{CodeEntryWidget.java => CodeEntryView.java}     |  6 +++---
 .../android/invitation/CodesDoNotMatchView.java      |  2 +-
 .../android/invitation/ConfirmationCodeView.java     |  2 +-
 .../android/invitation/ConnectionFailedView.java     | 10 +++++-----
 .../briar/android/invitation/ContactAddedView.java   |  2 +-
 .../briar/android/invitation/InvitationCodeView.java |  2 +-
 .../briar/android/invitation/NetworkSetupView.java   | 12 ++++++------
 .../{WifiWidget.java => WifiStatusView.java}         |  6 +++---
 .../briar/android/messages/ConversationActivity.java |  8 ++++----
 .../briar/android/messages/ConversationAdapter.java  |  4 ++--
 .../android/messages/ConversationListActivity.java   |  8 ++++----
 .../android/messages/ConversationListAdapter.java    |  2 +-
 .../android/messages/ReadPrivateMessageActivity.java | 10 +++++-----
 .../messages/WritePrivateMessageActivity.java        |  4 ++--
 .../{widgets => util}/CommonLayoutParams.java        |  2 +-
 .../android/{widgets => util}/HorizontalBorder.java  |  2 +-
 .../android/{widgets => util}/HorizontalSpace.java   |  2 +-
 .../{widgets => util}/ListLoadingProgressBar.java    |  6 +++---
 44 files changed, 118 insertions(+), 117 deletions(-)
 rename briar-android/src/net/sf/briar/android/invitation/{BluetoothWidget.java => BluetoothStatusView.java} (93%)
 rename briar-android/src/net/sf/briar/android/invitation/{CodeEntryWidget.java => CodeEntryView.java} (94%)
 rename briar-android/src/net/sf/briar/android/invitation/{WifiWidget.java => WifiStatusView.java} (93%)
 rename briar-android/src/net/sf/briar/android/{widgets => util}/CommonLayoutParams.java (95%)
 rename briar-android/src/net/sf/briar/android/{widgets => util}/HorizontalBorder.java (93%)
 rename briar-android/src/net/sf/briar/android/{widgets => util}/HorizontalSpace.java (89%)
 rename briar-android/src/net/sf/briar/android/{widgets => util}/ListLoadingProgressBar.java (71%)

diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 354d2d1b23..7c6c33da4b 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -11,8 +11,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 
 import java.util.ArrayList;
diff --git a/briar-android/src/net/sf/briar/android/SetupActivity.java b/briar-android/src/net/sf/briar/android/SetupActivity.java
index e272774b7b..73dd6b6261 100644
--- a/briar-android/src/net/sf/briar/android/SetupActivity.java
+++ b/briar-android/src/net/sf/briar/android/SetupActivity.java
@@ -9,8 +9,8 @@ import static android.view.Gravity.CENTER_HORIZONTAL;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static android.widget.LinearLayout.VERTICAL;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.io.IOException;
 import java.security.KeyPair;
diff --git a/briar-android/src/net/sf/briar/android/SplashScreenActivity.java b/briar-android/src/net/sf/briar/android/SplashScreenActivity.java
index a0683b5467..1d905f1cb5 100644
--- a/briar-android/src/net/sf/briar/android/SplashScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/SplashScreenActivity.java
@@ -2,7 +2,7 @@ package net.sf.briar.android;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
 import net.sf.briar.api.db.DatabaseConfig;
 import roboguice.RoboGuice;
 import roboguice.activity.RoboSplashActivity;
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java
index f603373968..b3fa2cd92f 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java
@@ -8,8 +8,8 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.blogs.ReadBlogPostActivity.RESULT_NEXT;
 import static net.sf.briar.android.blogs.ReadBlogPostActivity.RESULT_PREV;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.concurrent.Executor;
@@ -17,8 +17,8 @@ import java.util.logging.Logger;
 
 import net.sf.briar.R;
 import net.sf.briar.android.AscendingHeaderComparator;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.Author;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
index 046b10650b..bd181bdedf 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
@@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 
 import java.util.ArrayList;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.Author;
 import net.sf.briar.api.db.GroupMessageHeader;
 import net.sf.briar.api.messaging.Rating;
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java b/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java
index 5680ad9303..0b16ce3423 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java
@@ -9,9 +9,9 @@ import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.blogs.BlogListItem.MANAGE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -21,9 +21,9 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
index 470ee405c8..f99eb1a8a4 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
@@ -6,7 +6,7 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
 import static net.sf.briar.android.blogs.BlogListItem.MANAGE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,7 +14,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.format.DateUtils;
diff --git a/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java
index 0d7ca47c2c..1fe42adc6b 100644
--- a/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
index a92b19ea54..f699007d28 100644
--- a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
@@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.io.IOException;
 import java.security.KeyPair;
diff --git a/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java b/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java
index 1055024983..430e40e7d1 100644
--- a/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java
@@ -3,7 +3,7 @@ package net.sf.briar.android.blogs;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.blogs.ManageBlogsItem.NONE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
diff --git a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
index 7188674f24..f243acb1f9 100644
--- a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
@@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 import static net.sf.briar.api.messaging.Rating.UNRATED;
@@ -19,8 +19,8 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
diff --git a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
index e3d60e2a96..d8885ffe34 100644
--- a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
@@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -21,7 +21,7 @@ import net.sf.briar.android.identity.CreateIdentityActivity;
 import net.sf.briar.android.identity.LocalAuthorItem;
 import net.sf.briar.android.identity.LocalAuthorItemComparator;
 import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.LocalAuthor;
 import net.sf.briar.api.android.DatabaseUiExecutor;
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
index 061d52a10b..e525239cc8 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
@@ -10,9 +10,9 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.io.File;
 import java.util.Collection;
@@ -23,9 +23,9 @@ import java.util.logging.Logger;
 
 import net.sf.briar.R;
 import net.sf.briar.android.invitation.AddContactActivity;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.Contact;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.android.DatabaseUiExecutor;
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
index d20412f307..3ff0f06dad 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
@@ -2,7 +2,7 @@ package net.sf.briar.android.contact;
 
 import static android.view.Gravity.CENTER_VERTICAL;
 import static android.widget.LinearLayout.HORIZONTAL;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 
 import java.util.ArrayList;
 
diff --git a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
index cedcdc3ffd..f0f0f9fdc2 100644
--- a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
index 56b5187e02..7ebd8b5933 100644
--- a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
@@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
index c7de96f65c..49c125ef43 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
@@ -8,8 +8,8 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_NEXT;
 import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_PREV;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.concurrent.Executor;
@@ -17,8 +17,8 @@ import java.util.logging.Logger;
 
 import net.sf.briar.R;
 import net.sf.briar.android.AscendingHeaderComparator;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.Author;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index d47cc864c3..7f2cd71ab1 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 
 import java.util.ArrayList;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.Author;
 import net.sf.briar.api.db.GroupMessageHeader;
 import net.sf.briar.api.messaging.Rating;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
index bd4d274656..9f6741d6b2 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
@@ -9,9 +9,9 @@ import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.groups.GroupListItem.MANAGE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -19,9 +19,9 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
index 0c34a0e6ba..d1c1a542dd 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
@@ -6,7 +6,7 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
 import static net.sf.briar.android.groups.GroupListItem.MANAGE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,7 +14,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.format.DateUtils;
diff --git a/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java b/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
index 390de0e280..bba527fe71 100644
--- a/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
@@ -3,7 +3,7 @@ package net.sf.briar.android.groups;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.groups.ManageGroupsItem.NONE;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
index 097ce6024a..8ce4f8a4c4 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
@@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 import static net.sf.briar.api.messaging.Rating.UNRATED;
@@ -19,8 +19,8 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
diff --git a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
index f3168ad89c..d2bba87924 100644
--- a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
@@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -24,7 +24,7 @@ import net.sf.briar.android.identity.CreateIdentityActivity;
 import net.sf.briar.android.identity.LocalAuthorItem;
 import net.sf.briar.android.identity.LocalAuthorItemComparator;
 import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.LocalAuthor;
 import net.sf.briar.api.android.DatabaseUiExecutor;
diff --git a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
index 71e82cfbdd..f89fff502b 100644
--- a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
+++ b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
@@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 
 import java.io.IOException;
diff --git a/briar-android/src/net/sf/briar/android/invitation/AddContactView.java b/briar-android/src/net/sf/briar/android/invitation/AddContactView.java
index cd3602b301..a6ee0afc56 100644
--- a/briar-android/src/net/sf/briar/android/invitation/AddContactView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/AddContactView.java
@@ -1,7 +1,7 @@
 package net.sf.briar.android.invitation;
 
 import static android.view.Gravity.CENTER_HORIZONTAL;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
 import android.content.Context;
 import android.widget.LinearLayout;
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
similarity index 93%
rename from briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
rename to briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
index 073c5923af..1cec858cbc 100644
--- a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
@@ -3,7 +3,7 @@ package net.sf.briar.android.invitation;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
 import static android.provider.Settings.ACTION_BLUETOOTH_SETTINGS;
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import net.sf.briar.R;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
@@ -15,9 +15,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class BluetoothWidget extends LinearLayout implements OnClickListener {
+public class BluetoothStatusView extends LinearLayout
+implements OnClickListener {
 
-	public BluetoothWidget(Context ctx) {
+	public BluetoothStatusView(Context ctx) {
 		super(ctx);
 	}
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
similarity index 94%
rename from briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
rename to briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
index 6685abc36f..bafcba55d7 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
@@ -5,7 +5,7 @@ import static android.text.InputType.TYPE_CLASS_NUMBER;
 import static android.view.Gravity.CENTER;
 import static android.view.Gravity.CENTER_HORIZONTAL;
 import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import net.sf.briar.R;
 import android.content.Context;
 import android.view.KeyEvent;
@@ -18,14 +18,14 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-public class CodeEntryWidget extends LinearLayout
+public class CodeEntryView extends LinearLayout
 implements OnEditorActionListener, OnClickListener {
 
 	private CodeEntryListener listener = null;
 	private EditText codeEntry = null;
 	private Button continueButton = null;
 
-	public CodeEntryWidget(Context ctx) {
+	public CodeEntryView(Context ctx) {
 		super(ctx);
 	}
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
index c3e1ffb4a0..ca8d119e8d 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
@@ -1,7 +1,7 @@
 package net.sf.briar.android.invitation;
 
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import net.sf.briar.R;
 import android.content.Context;
 import android.view.View;
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
index 6d000b32f3..0e5caf53f2 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
@@ -49,7 +49,7 @@ implements CodeEntryListener {
 		code.setText(String.format("%06d", localCode));
 		addView(code);
 
-		CodeEntryWidget codeEntry = new CodeEntryWidget(ctx);
+		CodeEntryView codeEntry = new CodeEntryView(ctx);
 		Resources res = getResources();
 		codeEntry.init(this, res.getString(R.string.enter_confirmation_code));
 		addView(codeEntry);
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
index 658153b87e..f3c5bf42f6 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
@@ -1,7 +1,7 @@
 package net.sf.briar.android.invitation;
 
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import net.sf.briar.R;
 import android.content.Context;
 import android.view.View;
@@ -14,8 +14,8 @@ import android.widget.TextView;
 public class ConnectionFailedView extends AddContactView
 implements OnClickListener {
 
-	private WifiWidget wifi = null;
-	private BluetoothWidget bluetooth = null;
+	private WifiStatusView wifi = null;
+	private BluetoothStatusView bluetooth = null;
 	private Button tryAgainButton = null;
 
 	ConnectionFailedView(Context ctx) {
@@ -46,11 +46,11 @@ implements OnClickListener {
 		checkNetwork.setText(R.string.check_same_network);
 		addView(checkNetwork);
 
-		wifi = new WifiWidget(ctx);
+		wifi = new WifiStatusView(ctx);
 		wifi.init();
 		addView(wifi);
 
-		bluetooth = new BluetoothWidget(ctx);
+		bluetooth = new BluetoothStatusView(ctx);
 		bluetooth.init();
 		addView(bluetooth);
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
index 09a74dabe5..dfb2d01034 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
@@ -1,7 +1,7 @@
 package net.sf.briar.android.invitation;
 
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import net.sf.briar.R;
 import android.content.Context;
 import android.view.View;
diff --git a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
index c55f1bfb48..262b0ae94c 100644
--- a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
@@ -31,7 +31,7 @@ implements CodeEntryListener {
 		code.setText(String.format("%06d", localCode));
 		addView(code);
 
-		CodeEntryWidget codeEntry = new CodeEntryWidget(ctx);
+		CodeEntryView codeEntry = new CodeEntryView(ctx);
 		Resources res = getResources();
 		codeEntry.init(this, res.getString(R.string.enter_invitation_code));
 		addView(codeEntry);
diff --git a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
index 5c1487cd71..5756fb30b3 100644
--- a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
@@ -2,8 +2,8 @@ package net.sf.briar.android.invitation;
 
 import static android.view.Gravity.CENTER;
 import static net.sf.briar.android.identity.LocalAuthorItem.NEW;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import net.sf.briar.R;
 import net.sf.briar.android.identity.CreateIdentityActivity;
 import net.sf.briar.android.identity.LocalAuthorItem;
@@ -25,8 +25,8 @@ implements OnItemSelectedListener, OnClickListener {
 
 	private LocalAuthorSpinnerAdapter adapter = null;
 	private Spinner spinner = null;
-	private WifiWidget wifi = null;
-	private BluetoothWidget bluetooth = null;
+	private WifiStatusView wifi = null;
+	private BluetoothStatusView bluetooth = null;
 	private Button continueButton = null;
 
 	NetworkSetupView(Context ctx) {
@@ -56,11 +56,11 @@ implements OnItemSelectedListener, OnClickListener {
 		innerLayout.addView(spinner);
 		addView(innerLayout);
 
-		wifi = new WifiWidget(ctx);
+		wifi = new WifiStatusView(ctx);
 		wifi.init();
 		addView(wifi);
 
-		bluetooth = new BluetoothWidget(ctx);
+		bluetooth = new BluetoothStatusView(ctx);
 		bluetooth.init();
 		addView(bluetooth);
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
similarity index 93%
rename from briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
rename to briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
index 22d49df399..2f88acffc0 100644
--- a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
@@ -3,7 +3,7 @@ package net.sf.briar.android.invitation;
 import static android.content.Context.WIFI_SERVICE;
 import static android.provider.Settings.ACTION_WIFI_SETTINGS;
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import net.sf.briar.R;
 import android.content.Context;
 import android.content.Intent;
@@ -16,9 +16,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class WifiWidget extends LinearLayout implements OnClickListener {
+public class WifiStatusView extends LinearLayout implements OnClickListener {
 
-	public WifiWidget(Context ctx) {
+	public WifiStatusView(Context ctx) {
 		super(ctx);
 	}
 
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
index 3c6fc5cce9..2f3ffeaeb7 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.concurrent.Executor;
@@ -15,8 +15,8 @@ import java.util.logging.Logger;
 
 import net.sf.briar.R;
 import net.sf.briar.android.AscendingHeaderComparator;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.android.DatabaseUiExecutor;
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
index fadd7f8dc1..17207065de 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
@@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 
 import java.util.ArrayList;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.db.PrivateMessageHeader;
 import net.sf.briar.api.messaging.Rating;
 import android.content.Context;
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
index 2ffb72ba6d..d42e30ac46 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -16,8 +16,8 @@ import java.util.logging.Logger;
 
 import net.sf.briar.R;
 import net.sf.briar.android.invitation.AddContactActivity;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.ListLoadingProgressBar;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.Contact;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.android.DatabaseUiExecutor;
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java
index 80431fa552..a6ba168adf 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java
@@ -5,7 +5,7 @@ import static android.view.Gravity.LEFT;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 
 import java.util.ArrayList;
 
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
index 5a66b32039..c86cbc7267 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
@@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL;
 import static java.text.DateFormat.SHORT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
 import static net.sf.briar.api.messaging.Rating.BAD;
 import static net.sf.briar.api.messaging.Rating.GOOD;
 import static net.sf.briar.api.messaging.Rating.UNRATED;
@@ -19,8 +19,8 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
 import net.sf.briar.R;
-import net.sf.briar.android.widgets.HorizontalBorder;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalBorder;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
diff --git a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
index 78c46c0171..e67058b835 100644
--- a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
@@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -21,7 +21,7 @@ import net.sf.briar.android.contact.ContactItem;
 import net.sf.briar.android.contact.ContactItemComparator;
 import net.sf.briar.android.contact.ContactSpinnerAdapter;
 import net.sf.briar.android.invitation.AddContactActivity;
-import net.sf.briar.android.widgets.HorizontalSpace;
+import net.sf.briar.android.util.HorizontalSpace;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.Contact;
 import net.sf.briar.api.ContactId;
diff --git a/briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java b/briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java
similarity index 95%
rename from briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java
rename to briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java
index 465b98fad8..4026390835 100644
--- a/briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java
+++ b/briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java
@@ -1,4 +1,4 @@
-package net.sf.briar.android.widgets;
+package net.sf.briar.android.util;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
diff --git a/briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java b/briar-android/src/net/sf/briar/android/util/HorizontalBorder.java
similarity index 93%
rename from briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java
rename to briar-android/src/net/sf/briar/android/util/HorizontalBorder.java
index 9b462f0fcd..b75f474154 100644
--- a/briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java
+++ b/briar-android/src/net/sf/briar/android/util/HorizontalBorder.java
@@ -1,4 +1,4 @@
-package net.sf.briar.android.widgets;
+package net.sf.briar.android.util;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import net.sf.briar.R;
diff --git a/briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java b/briar-android/src/net/sf/briar/android/util/HorizontalSpace.java
similarity index 89%
rename from briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java
rename to briar-android/src/net/sf/briar/android/util/HorizontalSpace.java
index 215003f6ca..f173caf03b 100644
--- a/briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java
+++ b/briar-android/src/net/sf/briar/android/util/HorizontalSpace.java
@@ -1,4 +1,4 @@
-package net.sf.briar.android.widgets;
+package net.sf.briar.android.util;
 
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import android.content.Context;
diff --git a/briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java b/briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java
similarity index 71%
rename from briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java
rename to briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java
index b66fb8025e..fbc0bf2873 100644
--- a/briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java
+++ b/briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java
@@ -1,8 +1,8 @@
-package net.sf.briar.android.widgets;
+package net.sf.briar.android.util;
 
 import static android.view.Gravity.CENTER;
-import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1;
-import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP;
+import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
+import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
 import android.content.Context;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-- 
GitLab