diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-10 18:11:37 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-10 18:11:37 +0100 |
| commit | ef8eb3f8b5839adb17dc487808c2c478497a61d3 (patch) | |
| tree | e39b9e3b7415054f5433c2db3db377cdecba36ab /OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml | |
| parent | 83c346fec447a6748848938e994e19997d29092c (diff) | |
| parent | e00436b4096466af37b3e32c3f3277c3604d85ee (diff) | |
| download | open-keychain-ef8eb3f8b5839adb17dc487808c2c478497a61d3.tar.gz open-keychain-ef8eb3f8b5839adb17dc487808c2c478497a61d3.tar.bz2 open-keychain-ef8eb3f8b5839adb17dc487808c2c478497a61d3.zip | |
Merge pull request #381 from bhargavgolla/Lint-error-fix
Lint changes #223
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 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 |