From cac0f30816aef60430afd78095b4229ca62ea219 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 16 May 2016 17:08:48 -0300
Subject: [PATCH] Convert ExpiredActivity to XML

Closes #396
---
 briar-android/res/layout/activity_expired.xml |  9 ++++++
 .../briarproject/android/ExpiredActivity.java | 30 ++++---------------
 2 files changed, 15 insertions(+), 24 deletions(-)
 create mode 100644 briar-android/res/layout/activity_expired.xml

diff --git a/briar-android/res/layout/activity_expired.xml b/briar-android/res/layout/activity_expired.xml
new file mode 100644
index 000000000..d287f5742
--- /dev/null
+++ b/briar-android/res/layout/activity_expired.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_gravity="center"
+	android:gravity="center"
+	android:text="@string/expiry_warning"
+	android:textSize="@dimen/text_size_large"/>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/ExpiredActivity.java b/briar-android/src/org/briarproject/android/ExpiredActivity.java
index 84807661d..65e4c6076 100644
--- a/briar-android/src/org/briarproject/android/ExpiredActivity.java
+++ b/briar-android/src/org/briarproject/android/ExpiredActivity.java
@@ -1,17 +1,12 @@
 package org.briarproject.android;
 
-import static android.view.Gravity.CENTER;
-import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
-
-import org.briarproject.R;
-import org.briarproject.android.util.LayoutUtils;
-
 import android.app.Activity;
 import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+
+import org.briarproject.R;
+
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
 
 public class ExpiredActivity extends Activity {
 
@@ -21,19 +16,6 @@ public class ExpiredActivity extends Activity {
 
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
-		LinearLayout layout = new LinearLayout(this);
-		layout.setLayoutParams(MATCH_MATCH);
-		layout.setGravity(CENTER);
-
-		int pad = LayoutUtils.getPadding(this);
-
-		TextView warning = new TextView(this);
-		warning.setGravity(CENTER);
-		warning.setTextSize(18);
-		warning.setPadding(pad, pad, pad, pad);
-		warning.setText(R.string.expiry_warning);
-		layout.addView(warning);
-
-		setContentView(layout);
+		setContentView(R.layout.activity_expired);
 	}
 }