Revert "Lint changes"

This reverts commit e00436b409.

.gitignore

@@ -31,7 +31,3 @@ pom.xml.*
 
 #OS Specific
 [Tt]humbs.db
-
-#Lint output
-OpenPGP-Keychain/lint-report.html
-OpenPGP-Keychain/lint-report_files/*

OpenPGP-Keychain/build.gradle

@@ -57,7 +57,5 @@ android {
     // Do not abort build if lint finds errors
     lintOptions {
         abortOnError false
-        htmlReport true
-        htmlOutput file("lint-report.html")
     }
 }

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java

@@ -30,7 +30,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.util.Choice;
 
-import android.annotation.TargetApi;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -111,7 +110,6 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         setExpiryDate(null);
 
         mExpiryDateButton.setOnClickListener(new OnClickListener() {
-            @TargetApi(11)
             public void onClick(View v) {
                 GregorianCalendar date = mExpiryDate;
                 if (date == null) {

OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml

@@ -14,7 +14,7 @@
       limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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!)" />
 
-</merge>
+</FrameLayout>

OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml

@@ -14,7 +14,7 @@
       limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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!)" />
 
-</merge>
+</FrameLayout>

OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml

@@ -5,11 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:orientation="vertical">
+
+        <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"
@@ -68,6 +73,7 @@
                         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
@@ -200,6 +206,7 @@
                 </LinearLayout>
             </LinearLayout>
         </ScrollView>
+    </LinearLayout>
 
     <include layout="@layout/drawer_list" />
 

OpenPGP-Keychain/src/main/res/layout/drawer_list.xml

@@ -12,6 +12,7 @@
     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" />

OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml

@@ -71,8 +71,7 @@
                     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>
 

OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml

@@ -13,7 +13,7 @@
 
         <EditText
             android:id="@+id/server"
-            android:layout_width="0dip"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:inputType="textUri" />

OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml

@@ -14,7 +14,7 @@
         android:orientation="horizontal" >
 
         <RelativeLayout
-            android:layout_width="0dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="6sp"
             android:layout_marginLeft="16sp"

OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_key_list_secret_create"
-        app:showAsAction="ifRoom|withText"
+        app:showAsAction="always|withText"
         android:title="@string/menu_create_key" />
     <item
         android:id="@+id/menu_key_list_secret_create_expert"

OpenPGP-Keychain/src/main/res/menu/key_view.xml

@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_key_view_share"
         android:icon="@drawable/ic_action_share"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:title="@string/menu_share">
         <menu>
             <item

OpenPGP-Keychain/src/main/res/values-de/strings.xml

@@ -356,7 +356,7 @@
   <string name="api_select_pub_keys_missing_text">Für diese Benutzer-IDs wurden keine öffentlichen Schlüssel gefunden:</string>
   <string name="api_select_pub_keys_dublicates_text">Für diese Benutzer-IDs existieren mehrere öffentliche Schlüssel:</string>
   <string name="api_select_pub_keys_text">Bitte die Liste der Empfänger überprüfen!</string>
-  <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese App von einer anderen Quelle installiert? Wenn Sie eine Attacke ausschließen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die App erneut registrieren.</string>
+  <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese App von einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die App erneut registrieren.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Über QR Code teilen</string>
   <string name="share_qr_code_dialog_start">Mit \'Weiter\' durch alle QR-Codes gehen und diese nacheinander scannen.</string>

OpenPGP-Keychain/src/main/res/values/strings.xml

@@ -310,8 +310,8 @@
     </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
-    <string name="progress_done">Done.</string>
+    <string name="progress_done">done.</string>
-    <string name="progress_cancel">Cancel</string>
+    <string name="progress_cancel">cancel</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>