diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-10 18:23:47 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-10 18:23:47 +0100 |
| commit | d91e2673d7b291e1798e1acee506749eae3cdd01 (patch) | |
| tree | e2436d8c7a71093b5b99bc76a4cd391824110406 /OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml | |
| parent | ef8eb3f8b5839adb17dc487808c2c478497a61d3 (diff) | |
| download | open-keychain-d91e2673d7b291e1798e1acee506749eae3cdd01.tar.gz open-keychain-d91e2673d7b291e1798e1acee506749eae3cdd01.tar.bz2 open-keychain-d91e2673d7b291e1798e1acee506749eae3cdd01.zip | |
Revert "Lint changes"
This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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 c39f6978e..e51f63c80 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. --> -<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>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file |