daniel oeh f6c5251b98 Merge branch 'develop' into playback-speed ...

Conflicts:
	pom.xml
	src/de/danoeh/antennapod/service/PlaybackService.java
	src/de/danoeh/antennapod/util/playback/PlaybackController.java

2013-08-16 20:15:48 +02:00

..

about.xml

Implemented 'about'-Activity

2012-07-15 15:55:42 +02:00

addfeed.xml

Moved Opml import button to AddfeedActivity, Opml export button to

2012-10-03 15:54:50 +02:00

audioplayer_activity.xml

Added buttons to control playback speed

2013-05-03 18:31:39 +02:00

cover_fragment.xml

Added landscape layout to audio player

2013-04-04 18:21:37 +02:00

default_feeditemlist_item.xml

Added default getView() implementation for itemlistadapter

2013-02-28 21:10:26 +01:00

directory_chooser.xml

Implemented directory navigation

2012-12-23 11:09:05 +01:00

downloadlist_item.xml

Improved layout of download list

2012-08-15 16:46:42 +02:00

downloadlog_item.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

episodes_fragment.xml

Updated header view layout

2013-04-10 11:46:17 +02:00

external_itemlist_item.xml

Updated header view layout

2013-04-10 11:46:17 +02:00

external_player_fragment.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

feedinfo.xml

Moved text sizes into dimens file

2013-01-19 23:38:41 +01:00

feeditemlist_activity.xml

Added external player to feeditemlist

2012-09-06 18:10:29 +02:00

feeditemlist_header.xml

Updated header view layout

2013-04-10 11:46:17 +02:00

feeditemlist_item.xml

Set line number of title textview in itemlist to 2.

2013-04-11 10:55:27 +02:00

feeditemlist.xml

Do not display empty listview message while loading

2013-08-05 10:45:17 +02:00

feeditemview.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

feedlist_item_grid.xml

Updated tablet layout

2013-02-23 13:28:31 +01:00

feedlist_item.xml

improved layout of feedlist status indicators

2013-02-11 18:33:30 +01:00

feedlist.xml

Do not display empty listview message while loading

2013-08-05 10:45:17 +02:00

flattr_auth.xml

Added activities and classes for flattr authentication

2012-07-12 13:36:47 +02:00

listview_activity.xml

Removed ActionbarSherlock dependency

2013-08-07 11:35:18 +02:00

loading_footer.xml

Created fragment for displaying a list of Miro Guide channels

2012-08-02 21:23:02 +02:00

main.xml

Use tabs instead of viewpager indicator in main screen

2013-03-09 21:43:51 +01:00

miroguide_category.xml

Removed ViewPagerIndicator dependency

2013-08-06 20:02:30 +02:00

miroguide_categorylist.xml

Replaced 'miro' in filenames with 'miroguide'

2012-08-02 23:00:01 +02:00

miroguide_channellist_item.xml

Removed imageview from channellist

2012-08-04 11:35:05 +02:00

miroguide_channelview.xml

Moved text sizes into dimens file

2013-01-19 23:38:41 +01:00

miroguide_itemlist_item.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

miroguidesearch.xml

Replaced 'miro' in filenames with 'miroguide'

2012-08-02 23:00:01 +02:00

opml_import.xml

Created opml import activity

2012-07-23 13:50:08 +02:00

opml_selection.xml

Added chooser activity

2012-07-23 17:05:34 +02:00

organize_queue_listitem.xml

Updated tablet layout

2013-02-23 13:28:31 +01:00

organize_queue.xml

Fix gradle issue

2013-08-07 20:38:39 +02:00

playbackhistory_activity.xml

Implemented PlaybackHistoryActivity

2012-10-03 14:52:50 +02:00

player_widget.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

searchlist_item.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

searchlist.xml

implemented search button

2012-07-24 14:37:34 +02:00

simplechapter_item.xml

Use standard text colors

2013-01-20 00:02:29 +01:00

storage_error.xml

Added error activity if no external storage is available

2012-07-09 19:52:47 +02:00

time_dialog.xml

Implemented sleep timer menu item + fixed problems with dialog

2012-07-27 14:59:01 +02:00