From db6f8618e67e9b44f30fc9eb86d725c497219793 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Wed, 29 Oct 2014 18:28:20 -0700
Subject: [PATCH] padding workaround for bug in appcompat-v7 21.0.0

bug: https://code.google.com/p/android/issues/detail?id=77982

// FREEBIE
---
 res/drawable/passphrase_input_background.xml        | 2 +-
 res/layout/prompt_passphrase_activity.xml           | 8 ++++----
 res/layout/push_contact_selection_list_activity.xml | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/drawable/passphrase_input_background.xml b/res/drawable/passphrase_input_background.xml
index 205f11e971..c0538e9165 100644
--- a/res/drawable/passphrase_input_background.xml
+++ b/res/drawable/passphrase_input_background.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item>
-        <shape  android:shape="rectangle">
+        <shape android:shape="rectangle">
             <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index f6dfb70c91..183d24807f 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -9,8 +9,7 @@
 
     <RelativeLayout android:id="@+id/prompt_layout"
                     android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-        >
+                    android:layout_height="wrap_content">
 
         <ImageView android:id="@+id/watermark"
                    android:layout_width="wrap_content"
@@ -28,13 +27,14 @@
 
             <EditText android:id="@+id/passphrase_edit"
                       android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
+                      android:layout_height="45sp"
                       android:inputType="textPassword"
                       android:layout_marginLeft="50dp"
                       android:layout_marginRight="50dp"
                       android:singleLine="true"
                       android:background="@drawable/passphrase_input_background"
-                      android:padding="10dp"/>
+                      android:paddingLeft="10dp"
+                      android:paddingRight="10dp"/>
 
             <ImageButton android:id="@+id/ok_button"
                          android:src="@drawable/ic_action_forward"
diff --git a/res/layout/push_contact_selection_list_activity.xml b/res/layout/push_contact_selection_list_activity.xml
index baa587cb32..817073b7cb 100644
--- a/res/layout/push_contact_selection_list_activity.xml
+++ b/res/layout/push_contact_selection_list_activity.xml
@@ -7,12 +7,10 @@
     <EditText android:id="@+id/filter"
         android:inputType="textPersonName"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="45sp"
         android:hint="@string/recipients_panel__to"
         android:paddingRight="45dip"
         android:paddingLeft="15dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp"
         android:textColor="?conversation_editor_text_color"
         android:background="?conversation_editor_background" />