Revert "Lint changes"

This reverts commit e00436b409.
2014-03-10 18:23:47 +01:00
parent ef8eb3f8b5
commit d91e2673d7
14 changed files with 23 additions and 24 deletions
--- 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.
 -->

-<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>