From 002fa06ce9ac459fe4312cb65f528bcbff464d19 Mon Sep 17 00:00:00 2001
From: J-Jamet <jamet.jeremy@outlook.com>
Date: Fri, 3 Nov 2017 20:51:46 +0100
Subject: [PATCH] Replace all fill_parent by match_parent

---
 .../fingerprint/FingerPrintUtils.java         |  4 ---
 .../keepassdroid/view/EntryContentsView.java  |  2 +-
 .../com/keepassdroid/view/PwEntryView.java    |  2 +-
 .../com/keepassdroid/view/PwGroupView.java    |  2 +-
 app/src/main/res/layout/about.xml             |  8 ++---
 app/src/main/res/layout/browser_install.xml   |  4 +--
 app/src/main/res/layout/database_settings.xml |  6 ++--
 app/src/main/res/layout/entry_section.xml     |  6 ++--
 app/src/main/res/layout/entry_view.xml        |  8 ++---
 .../main/res/layout/entry_view_contents.xml   | 36 +++++++++----------
 .../res/layout/file_selection_filename.xml    |  6 ++--
 app/src/main/res/layout/generate_password.xml | 14 ++++----
 app/src/main/res/layout/group_add_entry.xml   |  6 ++--
 app/src/main/res/layout/group_edit.xml        |  6 ++--
 app/src/main/res/layout/group_empty.xml       |  8 ++---
 app/src/main/res/layout/icon_picker.xml       |  4 +--
 app/src/main/res/layout/set_password.xml      | 10 +++---
 17 files changed, 64 insertions(+), 68 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintUtils.java b/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintUtils.java
index 08d76b5d8..b2218c248 100644
--- a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintUtils.java
+++ b/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintUtils.java
@@ -4,10 +4,6 @@ import android.os.Build;
 
 import com.keepassdroid.compat.BuildCompat;
 
-/**
- * Created by joker on 03/11/17.
- */
-
 public class FingerPrintUtils {
 
     // Solve bug of VerifyError
diff --git a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java b/app/src/main/java/com/keepassdroid/view/EntryContentsView.java
index 07e5353b6..5116b747a 100644
--- a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java
+++ b/app/src/main/java/com/keepassdroid/view/EntryContentsView.java
@@ -45,7 +45,7 @@ public class EntryContentsView extends LinearLayout {
 
 	@Override
 	protected LayoutParams generateDefaultLayoutParams() {
-		return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
+		return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 	}
 
 }
diff --git a/app/src/main/java/com/keepassdroid/view/PwEntryView.java b/app/src/main/java/com/keepassdroid/view/PwEntryView.java
index 2aa87baa2..a33985db3 100644
--- a/app/src/main/java/com/keepassdroid/view/PwEntryView.java
+++ b/app/src/main/java/com/keepassdroid/view/PwEntryView.java
@@ -62,7 +62,7 @@ public class PwEntryView extends ClickView {
 		
 		populateView(ev, pw, pos);
 		
-		LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
+		LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 		
 		addView(ev, lp);
 
diff --git a/app/src/main/java/com/keepassdroid/view/PwGroupView.java b/app/src/main/java/com/keepassdroid/view/PwGroupView.java
index b195cdb4a..be4a30ec0 100644
--- a/app/src/main/java/com/keepassdroid/view/PwGroupView.java
+++ b/app/src/main/java/com/keepassdroid/view/PwGroupView.java
@@ -68,7 +68,7 @@ public class PwGroupView extends ClickView {
 		
 		populateView(gv, pw);
 		
-		LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
+		LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 		
 		addView(gv, lp);
 	}
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 95c54c7f8..d7416fa86 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -28,7 +28,7 @@
 		android:layout_height="wrap_content"
 		android:text="@string/AboutText"/>
 	<ImageView android:id="@+id/divider1"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:scaleType="fitXY"
 		tools:ignore="ContentDescription"
@@ -42,7 +42,7 @@
 		android:layout_height="wrap_content"
         android:layout_gravity="end"/>
 	<ImageView android:id="@+id/divider2"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:scaleType="fitXY"
 		tools:ignore="ContentDescription"
@@ -71,13 +71,13 @@
 		android:autoLink="web"/>
 	<ImageView android:id="@+id/divider3"
 		android:layout_marginTop="20dp"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:scaleType="fitXY"
 		tools:ignore="ContentDescription"
 		android:src="@android:drawable/divider_horizontal_dark"/>
 	<TextView android:id="@+id/disclaimer" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/disclaimer_formal"/>
 	<Button android:id="@+id/about_button"
diff --git a/app/src/main/res/layout/browser_install.xml b/app/src/main/res/layout/browser_install.xml
index bc8e900f0..c5acf5c1c 100644
--- a/app/src/main/res/layout/browser_install.xml
+++ b/app/src/main/res/layout/browser_install.xml
@@ -28,8 +28,8 @@
 	  android:text="@string/browser_intall_text"
 	/>
 	<LinearLayout 
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
+	  android:layout_width="match_parent"
+	  android:layout_height="match_parent"
 	  android:gravity="center_horizontal"
 	  android:orientation="vertical">
 		<Button android:id="@+id/install_market"
diff --git a/app/src/main/res/layout/database_settings.xml b/app/src/main/res/layout/database_settings.xml
index da95957d9..09f967d85 100644
--- a/app/src/main/res/layout/database_settings.xml
+++ b/app/src/main/res/layout/database_settings.xml
@@ -19,12 +19,12 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_margin="@dimen/default_margin"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<EditText android:id="@+id/rounds" 
 	  android:hint="@string/rounds_hint"
 	  android:layout_height="wrap_content"
-	  android:layout_width="fill_parent"
+	  android:layout_width="match_parent"
 	  android:inputType="number"/> 
 	<TextView android:id="@+id/rounds_explaination" 
 	  android:text="@string/rounds_explaination"
diff --git a/app/src/main/res/layout/entry_section.xml b/app/src/main/res/layout/entry_section.xml
index 8501de17c..b3c87d78e 100644
--- a/app/src/main/res/layout/entry_section.xml
+++ b/app/src/main/res/layout/entry_section.xml
@@ -18,16 +18,16 @@
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
 	<TextView android:id="@+id/title"
-	  android:layout_width="fill_parent"
+	  android:layout_width="match_parent"
 	  android:layout_height="wrap_content"
 	  style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle"	/>
 	<TextView
 		android:id="@+id/value"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:textIsSelectable="true"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
diff --git a/app/src/main/res/layout/entry_view.xml b/app/src/main/res/layout/entry_view.xml
index bfde9819e..79b6b61de 100644
--- a/app/src/main/res/layout/entry_view.xml
+++ b/app/src/main/res/layout/entry_view.xml
@@ -33,7 +33,7 @@
         android:elevation="4dp"
         tools:targetApi="lollipop" >
         <LinearLayout android:id="@+id/title_block"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:translationZ="10dp"
             style="@style/KeepassDXStyle.TextAppearance.Default">
@@ -55,15 +55,15 @@
     </android.support.v7.widget.Toolbar>
 
     <ScrollView android:id="@+id/entry_scroll"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_below="@+id/toolbar"
         android:fillViewport="true"
         android:scrollbarStyle="insideOverlay">
 
         <com.keepassdroid.view.EntryContentsView android:id="@+id/entry_contents"
             android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
+            android:layout_width="match_parent" />
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout/entry_view_contents.xml b/app/src/main/res/layout/entry_view_contents.xml
index bdc905ed5..dac51558f 100644
--- a/app/src/main/res/layout/entry_view_contents.xml
+++ b/app/src/main/res/layout/entry_view_contents.xml
@@ -21,28 +21,28 @@
 	android:layout_margin="@dimen/default_margin"
 	android:id="@+id/entry_table"
 	android:layout_height="wrap_content"
-	android:layout_width="fill_parent"
+	android:layout_width="match_parent"
 	android:orientation="vertical">
 	<!-- Username -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_user_name_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_user_name"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_user_name"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:textIsSelectable="true"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 
 	<!--  URL -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_url_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_url"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_url"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:autoLink="all"
 		android:textIsSelectable="true"
@@ -50,12 +50,12 @@
 
 	<!-- Password -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_password_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_password"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:inputType="textPassword"
         android:textIsSelectable="true"
@@ -63,64 +63,64 @@
 
 	<!-- Comment -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_comment_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_comment"
 		android:autoLink="all"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_comment"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:textIsSelectable="true"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 
 	<LinearLayout android:id="@+id/extra_strings"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
 	</LinearLayout>
 
 	<!-- Created -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_created_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_created"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_created" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 
 	<!-- Modified -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_modified_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_modified"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_modified" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 
 	<!-- Accessed -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_accessed_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_accessed"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_accessed" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 
 	<!-- Expires -->
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_expires_label"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/entry_expires"
 		style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 	<android.support.v7.widget.AppCompatTextView  android:id="@+id/entry_expires" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/file_selection_filename.xml b/app/src/main/res/layout/file_selection_filename.xml
index 211b59c6d..b75656729 100644
--- a/app/src/main/res/layout/file_selection_filename.xml
+++ b/app/src/main/res/layout/file_selection_filename.xml
@@ -19,7 +19,7 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_margin="@dimen/default_margin"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
 	<TextView android:id="@+id/label_warning"
@@ -29,7 +29,7 @@
 		android:visibility="invisible" />
 
 	<TextView android:id="@+id/label_open_by_filename" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		style="@style/KeepassDXStyle.TextAppearance.Title"
 		android:text="@string/enter_filename"/>
@@ -48,7 +48,7 @@
 
     <android.support.v7.widget.AppCompatEditText
         android:id="@+id/file_filename"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/label_open_by_filename"
         android:inputType="textUri"
diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml
index d517c60a3..d7c60ca1f 100644
--- a/app/src/main/res/layout/generate_password.xml
+++ b/app/src/main/res/layout/generate_password.xml
@@ -19,8 +19,8 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_margin="@dimen/default_margin"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<Button android:id="@+id/accept_button"
 		android:layout_margin="@dimen/button_margin"
 		android:layout_height="wrap_content"
@@ -43,21 +43,21 @@
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content">
 		    <EditText android:id="@+id/password"
-				android:layout_width="fill_parent"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:ems="10"
 				android:maxLines="1"
 				android:hint="@string/hint_generated_password" />
 		    <Button android:id="@+id/generate_password_button"
 				android:layout_margin="@dimen/button_margin"
-				android:layout_width="fill_parent"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_below="@id/password"
 				android:text="@string/generate_password" />
 		    <TextView android:id="@+id/length_label"
 				android:text="@string/length"
-				android:layout_height="fill_parent"
-				android:layout_width="fill_parent"
+				android:layout_height="match_parent"
+				android:layout_width="match_parent"
 				android:layout_below="@id/generate_password_button" />
 			<Button android:id="@+id/btn_length16"
 				android:text="@string/generate_16"
@@ -92,7 +92,7 @@
 				android:minWidth="60dp"
 				android:layout_alignTop="@id/btn_length16" />
 			<EditText android:id="@+id/length" 
-				android:layout_width="fill_parent"
+				android:layout_width="match_parent"
 				android:layout_toLeftOf="@id/btn_length6"
 				android:layout_toStartOf="@id/btn_length6"
 				android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_add_entry.xml b/app/src/main/res/layout/group_add_entry.xml
index 1766d30f5..52677d083 100644
--- a/app/src/main/res/layout/group_add_entry.xml
+++ b/app/src/main/res/layout/group_add_entry.xml
@@ -19,8 +19,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:layout_width="match_parent"
+	android:layout_height="match_parent">
 
     <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -43,7 +43,7 @@
     </android.support.v7.widget.Toolbar>
 
     <ListView android:id="@+id/group_list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/toolbar"/>
 
diff --git a/app/src/main/res/layout/group_edit.xml b/app/src/main/res/layout/group_edit.xml
index 6a0b19c3c..bc0879e8f 100644
--- a/app/src/main/res/layout/group_edit.xml
+++ b/app/src/main/res/layout/group_edit.xml
@@ -19,8 +19,8 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_margin="@dimen/default_margin"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<android.support.v7.widget.AppCompatImageButton android:id="@+id/icon_button"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
 		android:layout_alignParentEnd="true"
 		android:layout_alignParentTop="true"/>
 	<EditText android:id="@+id/group_name" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="4dp"
 		android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/group_empty.xml b/app/src/main/res/layout/group_empty.xml
index ac53edd3e..16a6a6c74 100644
--- a/app/src/main/res/layout/group_empty.xml
+++ b/app/src/main/res/layout/group_empty.xml
@@ -18,18 +18,18 @@
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<com.keepassdroid.view.GroupHeaderView
 	  android:id="@+id/group_header"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"/>
 	<ListView android:id="@android:id/list"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_below="@id/group_header"/>
 	<TextView
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_below="@android:id/list"
       android:text="@string/no_results"/>
diff --git a/app/src/main/res/layout/icon_picker.xml b/app/src/main/res/layout/icon_picker.xml
index 884136d92..88b378536 100644
--- a/app/src/main/res/layout/icon_picker.xml
+++ b/app/src/main/res/layout/icon_picker.xml
@@ -19,8 +19,8 @@
 -->
 <GridView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/IconGridView"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:verticalSpacing="5dp"
     android:horizontalSpacing="5dp"
     android:columnWidth="60dp"
diff --git a/app/src/main/res/layout/set_password.xml b/app/src/main/res/layout/set_password.xml
index ab7b0ceb3..478e0aa40 100644
--- a/app/src/main/res/layout/set_password.xml
+++ b/app/src/main/res/layout/set_password.xml
@@ -19,23 +19,23 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:padding="@dimen/default_margin"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<EditText android:id="@+id/pass_password" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:inputType="textPassword"
 		android:maxLines="1"
 		android:hint="@string/hint_pass"/>
 	<EditText android:id="@+id/pass_conf_password" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/pass_password"
 		android:inputType="textPassword"
 		android:maxLines="1"
 		android:hint="@string/hint_conf_pass"/>
 	<EditText android:id="@+id/pass_keyfile" 
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/pass_conf_password"
 		android:maxLines="1"