diff options
| author | Bhargav Golla <bhargav.golla@gmail.com> | 2014-03-07 18:21:16 -0500 |
|---|---|---|
| committer | Bhargav Golla <bhargav.golla@gmail.com> | 2014-03-10 12:42:00 -0400 |
| commit | e00436b4096466af37b3e32c3f3277c3604d85ee (patch) | |
| tree | 1dc52603d0563a5fe60119742c3a775b9d1c474c /OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml | |
| parent | 0e33fd23924471caef81f12d0828e17da32582d7 (diff) | |
| download | open-keychain-e00436b4096466af37b3e32c3f3277c3604d85ee.tar.gz open-keychain-e00436b4096466af37b3e32c3f3277c3604d85ee.tar.bz2 open-keychain-e00436b4096466af37b3e32c3f3277c3604d85ee.zip | |
Lint changes
Deleting lint-report gen files
Adding lint output files to gitignore
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 |