diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-05-19 00:04:19 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-05-19 00:04:19 +0200 |
| commit | 0f3b77ed8e9a738039cd4f4fbd11919b1f2c6f93 (patch) | |
| tree | bfee5104dadcf27b6f78a4561de1827c0e38d545 /res/values/attrs.xml | |
| parent | 81fd465276cb9369fa7e82830e97b747d61b4f7e (diff) | |
| parent | f5cbd52fdc8edec26a5df4ee6add616b9273e437 (diff) | |
| download | AntennaPod-0f3b77ed8e9a738039cd4f4fbd11919b1f2c6f93.zip | |
Merge branch 'newgui' into develop. closes #407
Conflicts:
res/layout/feedinfo.xml
Diffstat (limited to 'res/values/attrs.xml')
| -rw-r--r-- | res/values/attrs.xml | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index e8334cd60..08a8063c1 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,39 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="action_about" format="reference" /> - <attr name="action_search" format="reference" /> - <attr name="action_settings" format="reference" /> - <attr name="action_stream" format="reference" /> - <attr name="av_download" format="reference" /> - <attr name="av_fast_forward" format="reference" /> - <attr name="av_pause" format="reference" /> - <attr name="av_play" format="reference" /> - <attr name="av_rewind" format="reference" /> - <attr name="content_discard" format="reference" /> - <attr name="content_new" format="reference" /> - <attr name="default_cover" format="reference" /> - <attr name="device_access_time" format="reference" /> - <attr name="location_web_site" format="reference" /> - <attr name="navigation_accept" format="reference" /> - <attr name="navigation_cancel" format="reference" /> - <attr name="navigation_expand" format="reference" /> - <attr name="navigation_collapse" format="reference" /> - <attr name="navigation_refresh" format="reference" /> - <attr name="navigation_up" format="reference" /> - <attr name="navigation_shownotes" format="reference" /> - <attr name="navigation_chapters" format="reference" /> - <attr name="social_share" format="reference" /> - <attr name="stat_playlist" format="reference" /> - <attr name="type_audio" format="reference" /> - <attr name="type_video" format="reference" /> - <attr name="borderless_button" format="reference" /> - <attr name="spinner_button" format="reference" /> - <attr name="overlay_drawable" format="reference" /> - <attr name="dragview_background" format="reference" /> - <attr name="dragview_float_background" format="reference" /> + <attr name="action_about" format="reference"/> + <attr name="action_search" format="reference"/> + <attr name="action_settings" format="reference"/> + <attr name="action_stream" format="reference"/> + <attr name="av_download" format="reference"/> + <attr name="av_fast_forward" format="reference"/> + <attr name="av_pause" format="reference"/> + <attr name="av_play" format="reference"/> + <attr name="av_rewind" format="reference"/> + <attr name="content_discard" format="reference"/> + <attr name="content_new" format="reference"/> + <attr name="default_cover" format="reference"/> + <attr name="device_access_time" format="reference"/> + <attr name="location_web_site" format="reference"/> + <attr name="navigation_accept" format="reference"/> + <attr name="navigation_cancel" format="reference"/> + <attr name="navigation_expand" format="reference"/> + <attr name="navigation_collapse" format="reference"/> + <attr name="navigation_refresh" format="reference"/> + <attr name="navigation_up" format="reference"/> + <attr name="navigation_shownotes" format="reference"/> + <attr name="navigation_chapters" format="reference"/> + <attr name="social_share" format="reference"/> + <attr name="stat_playlist" format="reference"/> + <attr name="type_audio" format="reference"/> + <attr name="type_video" format="reference"/> + <attr name="borderless_button" format="reference"/> + <attr name="spinner_button" format="reference"/> + <attr name="overlay_drawable" format="reference"/> + <attr name="dragview_background" format="reference"/> + <attr name="dragview_float_background" format="reference"/> + <attr name="ic_action_overflow" format="reference"/> + <attr name="ic_new" format="reference"/> <!-- Used in itemdescription --> - <attr name="non_transparent_background" format="reference" /> - <attr name="overlay_background" format="color" /> + <attr name="non_transparent_background" format="reference"/> + <attr name="overlay_background" format="color"/> + <attr name="nav_drawer_background" format="color"/> + <attr name="nav_drawer_toggle" format="reference"/> </resources>
\ No newline at end of file |