From e00436b4096466af37b3e32c3f3277c3604d85ee Mon Sep 17 00:00:00 2001
From: Bhargav Golla <bhargav.golla@gmail.com>
Date: Fri, 7 Mar 2014 18:21:16 -0500
Subject: Lint changes

Deleting lint-report gen files

Adding lint output files to gitignore
---
 .../src/main/res/layout/actionbar_include_cancel_button.xml |  4 ++--
 .../src/main/res/layout/actionbar_include_done_button.xml   |  4 ++--
 OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml   | 13 +++----------
 OpenPGP-Keychain/src/main/res/layout/drawer_list.xml        |  1 -
 .../src/main/res/layout/edit_key_user_id_item.xml           |  3 ++-
 OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml  |  2 +-
 .../src/main/res/layout/key_server_preference.xml           |  2 +-
 7 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/layout')

diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
index 5fd36286b..04f41d38c 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
@@ -14,7 +14,7 @@
       limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/actionbar_cancel"
     style="@style/Widget.AppCompat.ActionButton"
     android:layout_width="0dp"
@@ -33,4 +33,4 @@
         style="@style/Widget.AppCompat.Light.ActionBar.TabText"
         android:text="Cancel (set in-code!)" />
 
-</FrameLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
index e51f63c80..c39f6978e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
@@ -14,7 +14,7 @@
       limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/actionbar_done"
     style="@style/Widget.AppCompat.ActionButton"
     android:layout_width="0dp"
@@ -33,4 +33,4 @@
         style="@style/Widget.AppCompat.Light.ActionBar.TabText"
         android:text="Done (set in-code!)" />
 
-</FrameLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index c56ba130e..22e8192f2 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
@@ -5,16 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:orientation="vertical">
-
-        <ScrollView
+    <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true">
+            android:fillViewport="true"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -73,7 +68,6 @@
                         android:layout_gravity="left"
                         android:text="@string/label_main_user_id"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_alignTop="@+id/linearLayout"
                         android:layout_toRightOf="@+id/relativeLayout" />
 
                     <TextView
@@ -206,7 +200,6 @@
                 </LinearLayout>
             </LinearLayout>
         </ScrollView>
-    </LinearLayout>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
index 18210afc5..6454b3333 100644
--- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
@@ -12,7 +12,6 @@
     android:layout_width="240dp"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    android:background="#fff"
     android:choiceMode="singleChoice"
     android:divider="@color/bg_gray"
     android:dividerHeight="1dp" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
index 663949d8e..437e5ebaf 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -71,7 +71,8 @@
                     android:id="@+id/comment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:inputType="text"/>
             </TableRow>
         </TableLayout>
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
index 058a43eaf..950978a0e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
@@ -13,7 +13,7 @@
 
         <EditText
             android:id="@+id/server"
-            android:layout_width="match_parent"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:inputType="textUri" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
index 4a09e4240..eddbe3cbf 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
@@ -14,7 +14,7 @@
         android:orientation="horizontal" >
 
         <RelativeLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_marginBottom="6sp"
             android:layout_marginLeft="16sp"
-- 
cgit v1.2.3