Squashed commit of the following:

commit 35fb6bb27de315a4793337bced02849d5d9c4384
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sat Aug 17 14:13:58 2013 +0200

    Improve context menus

    - Add a 'play next' item to song context menu
    - Replace 'add to queue' by 'remove from queue' item in queue context
      menu

    Change-Id: I7ce2af040fdf823b025237518bf4ccc063812777

commit a2df68ce3b81e36797b2a688f83a34f0ad52fa8f
Author: Hendrik Borghorst <hendrikborghorst@gmail.com>
Date:   Wed Aug 14 20:26:32 2013 +0200

    Reset next Track in Apollo on QUEUE_CHANGED

    If you change the queue for the next track mediaplayer don't gets reinitialized.

    This means the next song which is played is actually the one queued before change of queue.

    PS2: Only setNextTrack if Service is actually playing at the moment.
    PS3: Whitespace fix
    PS4: Remove last track in queue case included. Space fixed

    Change-Id: I9ddd762d3c42815e7b365f6a5c4b124f5d940a5a

commit d2ec987449f68c4894ad7de48adc8ee66392554b
Merge: 5fc2d65 4d248fc
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Aug 6 18:28:42 2013 +0000

    Merge "Add support for new remote control interfaces in API 18." into cm-10.2

commit 4d248fc6726028898b4e17ab34704f45114a99d6
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Jul 29 17:19:54 2013 +0200

    Add support for new remote control interfaces in API 18.

    Also add album artist to remote control data.

    Change-Id: Ia7da61a968abc12b914b22f0111a4adce12a744d

commit 5fc2d658b9b3ae102cc80215e52fd63c6bf561ba
Merge: 6df0b5f 82a9245
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sat Aug 3 11:17:23 2013 +0000

    Merge "Apollo: allow deletion of tracks in Queue." into cm-10.2

commit 82a92456092a05f7464a1e357f5faf8b038146cf
Author: Kyrylo Mikos <kiril.mik.os@gmail.com>
Date:   Thu Aug 1 15:49:21 2013 +0300

    Apollo: allow deletion of tracks in Queue.

    After introducing of DeleteDialogCallback it is safe
    to remove songs from queue.

    Change-Id: Ifa6c39312244413801a5d5628f1d5251b27ee147

commit 6df0b5f2ce5907ef6dceb24fbe499533fb944e38
Merge: eafb7f6 f11573d
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Jul 31 05:01:56 2013 +0000

    Merge "Apollo: zh-rTW translations" into cm-10.2

commit eafb7f69ba290220bf9e493bdbac76e1af6b2b91
Author: Przemyslaw Kryger <pkryger@gmail.com>
Date:   Sun Jul 28 13:03:16 2013 +0200

    Apollo: Make albums with the same name to use respective album-art/date/etc.

    It may happen that two (or more) albums have the same name but each of them
    comes from different artist. This case was not handled correctly causing with
    the same album art to be used for all albums.

    This patch makes sure that the proper album data is fetched for album. It's
    achieved by either adding album artist (i.e., for cached images) or using
    album id (unique) where possible (not causing too much code churn).

    Change-Id: I181a28d80a18207101c613cca390f18d88dd556a

commit f11573d2528c8e2c4db0ed6bc42729cdc3e1a797
Author: Fu-Chun Hsu <hsufuchun@gmail.com>
Date:   Mon Jul 29 01:06:28 2013 +0800

    Apollo: zh-rTW translations

    Update Taiwan translations.

    Change-Id: I71a8c4ec07874504a83a2f8ab61840a574e36a93

commit 48d4693a6ad6cfe42ad06fc42a9e8ab6121ef516
Merge: 6021725 2c26983
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Jul 23 20:12:49 2013 +0000

    Merge "Apollo: Add menu action to delete current track." into cm-10.1

commit 2c2698352664f2ab6d2e6c06fa0b1c9e7bc42730
Author: Kyrylo Mikos <kiril.mik.os@gmail.com>
Date:   Wed Jul 10 23:45:40 2013 +0300

    Apollo: Add menu action to delete current track.

    Change-Id: I8fad766ebba53bf37d8f965761e9da4ca4fafb87

commit 602172584d61012e8f6bf2a7ca8ccf234e7e9077
Merge: ed7c82f e46607c
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Jul 22 15:24:23 2013 +0000

    Merge "Add some (optional) debug logging to the player service." into cm-10.1

commit ed7c82f26217174a2174b8184b4e13f83e927690
Merge: ab7dece 7aa615e
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Jul 22 15:24:05 2013 +0000

    Merge "Cleanup: Use only one method to shut down the service instead of two." into cm-10.1

commit ab7dece27475e250b0fe6dcf44f35bb975c8e7ab
Merge: 6ed8f22 3f090d6
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon Jul 22 07:02:57 2013 +0000

    Merge "Apollo:add: tradtional chinese translation" into cm-10.1

commit 6ed8f2206da69caeb6f957c7a1934414d56bbc5a
Author: Davis Mosenkovs <davikovs@gmail.com>
Date:   Sun Jul 21 16:36:36 2013 -0700

    Apollo: LV translation fix

    Change-Id: Iba232fe3ada921ef4debb5dbd011a201d252c1df

commit 3320aa90f956a41d882ff830c70a2b827d05b1d7
Author: Kyrylo Mikos <kiril.mik.os@gmail.com>
Date:   Fri Jul 19 16:01:10 2013 +0300

    Apollo: open album by id rather by name and artist.

    Some artist has albums splitted into 2 parts with same name
    and in Apollo when we clicking on both albums we will get into
    Profile activity with first part of album.

    Change-Id: I96d5e7ee3ce0a04c708d1d8941096aaf942a25e3

commit 3f090d6caee8439f34e9f05f4bcede9a10747b32
Author: tonyli1357 <tonyli1357@gmail.com>
Date:   Tue Jul 16 20:53:41 2013 +0800

    Apollo:add: tradtional chinese translation

    Change-Id: I7c72a6d321fe1f226da4a79535d9704e2ae42e61

commit e46607c3a4d9c9b54378822e424705cbfb1ead6e
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Jul 12 10:05:15 2013 +0200

    Add some (optional) debug logging to the player service.

    Change-Id: I2f5aa9d0f799395b967906c9fc9677a80ab18e8f

commit 7aa615efabc05319a26625ae3599fc028837729c
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Jul 9 13:05:41 2013 +0200

    Cleanup: Use only one method to shut down the service instead of two.

    Also make sure to release the audio focus when removing the notification
    due to being idle in order to remove the play controls from the
    lockscreen.

    Change-Id: I323db520ce107235ebe774109d0a3338688328b4

commit 2d130bacf6074f484e5605ddca95343bc3244c4e
Author: Davis Mosenkovs <davikovs@gmail.com>
Date:   Wed Jul 10 05:17:05 2013 -0700

    Apollo: LV translation (rebase)

    Change-Id: I1c6104aaec01f2afac06b083884218dc1d23b5f1

commit a65ae6192b720305e8cc3fadecaa0432926bc8b0
Merge: f16cfad 48fc4ef
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Jul 8 00:46:23 2013 -0700

    Merge "Apollo: Update Polish translation" into cm-10.1

commit f16cfad1389c3f51186e8e01a0d8f8cab3d8275e
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sat Jul 6 11:58:18 2013 -0300

    Apollo: PT-BR update translations

    Change-Id: I662b92546e2728e253c54d76ef9bbacea020f4f9

commit 6b69963068af7ab580331dfc428b636981d5ea6a
Author: Kyrylo Mikos <kiril.mik.os@gmail.com>
Date:   Mon Jun 24 21:11:49 2013 +0300

    Apollo: Ignore playlist when name is null.

    This will avoid nex crash:

    FATAL EXCEPTION: main
    java.lang.IllegalArgumentException: the bind value at index 1 is null
     	at android.database.DatabaseUtils.readExceptionFromParcel(DatabaseUtils.java:167)
     	at android.database.DatabaseUtils.readExceptionFromParcel(DatabaseUtils.java:137)
     	at android.content.ContentProviderProxy.query(ContentProviderNative.java:366)
     	at android.content.ContentResolver.query(ContentResolver.java:372)
     	at android.content.ContentResolver.query(ContentResolver.java:315)
     	at com.andrew.apollo.utils.MusicUtils.getIdForPlaylist(MusicUtils.java:669)
     	at com.andrew.apollo.utils.MusicUtils.makePlaylistMenu(MusicUtils.java:1146)
     	at com.andrew.apollo.ui.fragments.QueueFragment.onCreateContextMenu(QueueFragment.java:215)

    Change-Id: Ib60a55f54fedf18cf900c6e492c5b4135e5c86d8

commit 48fc4ef09327d8a5ab9edf122a4c15bb566f873e
Author: Tomasz Popielarczyk <popielarczyktomasz@gmail.com>
Date:   Tue Jul 2 23:08:32 2013 +0200

    Apollo: Update Polish translation

    Change-Id: Ia8328cb17e081931109535b2640da88430e762f3

commit 3e3d79c5fb5d69a94eb46ca85fc370e92c8084a7
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Jul 2 16:06:15 2013 +0200

    Fix merge derp.

    Change-Id: I073afea4845958d0691687771c681c2e0900053e

commit ba7e99bb44f8f35f905131d7fdd5434d00292b55
Merge: 2f2b733 25527a2
Author: David van Tonder <david.vantonder@gmail.com>
Date:   Tue Jul 2 06:32:55 2013 -0700

    Merge "Make sure notification is shown when playback is started via media button intent." into cm-10.1

commit 25527a27792137cb3381eec6215b7eb51a7cda9c
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Jun 28 12:45:08 2013 +0200

    Make sure notification is shown when playback is started via media
    button intent.

    Also make sure to properly remove it when music is stopped with screen
    of (e.g. when playing via BT): As handlers only count non-sleep times,
    we have to use the alarm manager in order to make sure the notification
    is removed after 1 minute.

    JIRA: CYAN-1067
    Change-Id: I87a5328e5116d199e2f62119f5a76eca73a3ee4e

commit 2f2b733cbcf985ec648b550c46741dd14dff13ff
Merge: 00f8f11 ae09653
Author: David van Tonder <david.vantonder@gmail.com>
Date:   Tue Jul 2 06:30:03 2013 -0700

    Merge "Don't start playing if we couldn't acquire audio focus." into cm-10.1

commit 00f8f1139647b6d3e17f003c98ec5cff7bfff374
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Jul 2 08:14:24 2013 +0200

    Fix audio session ID handling when invoking DSP manager.

    Change-Id: I8ebb71e32191b79f08cfa9c72fab311048992fe8

commit 3df81e52c2cdff4f2871d7d4c1a25fb026e4f8d3
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Jun 30 12:43:37 2013 +0200

    Kill off the option to not use RemoteControlClient.

    In API level 18 the RCC will also be used for AVRCP 1.3 metadata, which
    we certainly want to support. The decision whether to show the music
    controls in the keyguard should be done at the framework level.

    Change-Id: Ia17f9094231f3a76d1496ddf2ef2d90b2d4d9512

commit ae09653f67bf2c50e578dbc43f091f0650e1e76e
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Jun 28 13:02:49 2013 +0200

    Don't start playing if we couldn't acquire audio focus.

    This makes us not start playback when we get a 'play' media button event
    in the middle of a call for whatever reason.

    JIRA:CYAN-1067
    Change-Id: If648da95c10716400eeba0b39a24213764370f7a

commit a68a6b8173cd4fb67a55bfce9bdcac6598cc449b
Author: brisky <brisky@mail.telepac.pt>
Date:   Mon Jun 10 19:21:46 2013 +0100

    Added PT-PT language support for Apollo

    Change-Id: I3d60d42bb7cc4e28a2ea1b7e15a7d8f68adc2853

commit 11e45b126545767bd00131341902dfbc804eb08b
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sun May 26 05:52:10 2013 -0700

    Apollo: PT-BR update translations

    Change-Id: Id78d11cd9e4dfb248830f186702e8c870e9780b2

commit 43ef1ccd8b537597bc0228a485eec5c8eb6aa80f
Author: prescott66 <prescott66@gmail.com>
Date:   Sat May 25 23:16:58 2013 +0200

    Apollo: SK Translations

    Change-Id: I15ef3d993559846b01508453c55506c5cbacc679

commit 1b27f924a1dc10da3db8dee05de1b144c2336fa4
Merge: b5b344f 48aaf78
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 23 15:11:27 2013 -0700

    Merge "Apollo : translation" into cm-10.1

commit b5b344ffdf703c23b503149328aa48de63b1d736
Author: okrt <ogzkirat@gmail.com>
Date:   Wed May 22 03:31:51 2013 +0300

    Apollo: TR translations

    Change-Id: I4fc64a54f96575e479c69aa9093ca8a76f726f9f

commit 48aaf78244543a19412b3f85db3115286788100f
Author: DelPETER <delphinpeter@gmail.com>
Date:   Wed May 22 23:15:07 2013 +0200

    Apollo : translation

    Update translatable attribute

    Change-Id: I68be568ab2ee4d4f177fc4a7e8826552f4e74f84

commit a9edef57b6acdc981870002c5778fec1acf3f3a8
Merge: e3547b0 aca1fdc
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue May 21 09:25:39 2013 -0700

    Merge "Apollo: RU translation" into cm-10.1

commit e3547b0338302371772e3cc0869b31fc0dceaf19
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Mon May 20 22:35:29 2013 +0200

    Apollo: CS translation

    - added Czech
    - fixed typo

    Little millenium we celebrate now - this is last commit for CM
    application. Only device specific project remains. Thanks to all of
    proofreaders/reviewers. Good work.

    Change-Id: I463f2eadc9af88916bca794a2588ceac37c39fc1

commit aca1fdc54db4e98c7668a9994cc4bdd9fe2bbf5a
Author: pvolkov <marshmollow@gmail.com>
Date:   Sat May 18 22:08:58 2013 +0400

    Apollo: RU translation

    Patch Set 2: Update translation

commit 0466f8503bff563725e171fd2c997dfd663f62ce
Author: pvolkov <marshmollow@gmail.com>
Date:   Fri May 17 12:30:05 2013 +0400

    Apollo: RU translation

    Patch Set 2: Updated translation

commit b7684c2ffa4ddc885b2141e9e3d74619a2eb172a
Merge: 7ffb04f 1d4aea5
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 11 13:04:57 2013 -0700

    Merge "Apollo: Simplified Chinese Translations" into cm-10.1

commit 7ffb04f6a6794d430a8a3532c76859aefa56a331
Merge: 74b2125 70d7595
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 11 09:22:50 2013 -0700

    Merge "Apollo: RU translation" into cm-10.1

commit 74b21255f3494ab57c8f72502c140b08a0c055cb
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Thu May 9 21:44:36 2013 +0200

    Apollo: NB translation

    PS2: Trying to make Cid happy!

    Commit for staging: http://review.cyanogenmod.org/#/c/37282/

    Change-Id: I9f50dfd393533b5fcee093fd8445ce9a1987f482

commit 1d4aea55adf96daebc152ceb34b134885d1855dc
Author: Andrew Jiang <sam.andrew.jiang@gmail.com>
Date:   Fri May 10 18:22:54 2013 -0400

    Apollo: Simplified Chinese Translations

    Just some cleanup to bring it inline with the English file.

    Change-Id: I7b58d29e72607389c09193217112ad7893c70c9c

commit 465c6d142ca2700e8b014a66d6cb0aa511eb98a3
Merge: d146601 7562ea1
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 9 08:31:08 2013 -0700

    Merge "Apollo: DA translation" into cm-10.1

commit 70d7595749660533c0af115e1e16bfeb7fe56b0e
Author: Vladimir Belkov <belladimir@gmail.com>
Date:   Thu May 9 16:01:59 2013 +0400

    Apollo: RU translation

    Change-Id: I9f87d2ae09ee74c829c176251b1edbb6810fb6c9

commit d14660145fb60a6c021282cb7464fff70e27b37b
Merge: 0e9ff37 d9aeb22
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 9 00:40:54 2013 -0700

    Merge "Apollo: NL translations" into cm-10.1

commit 0e9ff37bcab83e41cb6f01e2edfc5b636a31f3be
Author: isimobile <isimobile@ismaakit.com>
Date:   Sun Apr 14 18:16:40 2013 +0200

    Afrikaans: Add missing translations & plurals

    Change-Id: Ifca2bf09f0435e4a7260368b79aa581296d04622

commit d9aeb227383750f808fa0a648d700f2d258c2476
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue May 7 14:09:04 2013 +0200

    Apollo: NL translations

    Change-Id: I350e44c6a768df096533249cf0debf206309e244

commit 7562ea1f5b9a7fc71f7fa3bb15e23ddef5deb4f5
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Mon May 6 22:07:58 2013 +0200

    Apollo: DA translation

    New string

    Change-Id: I76e3176eb72241ec301ce56f4dbe805c0eb39ed0

commit 635718a5cb6facb195c83d5fb75cf1f8af5cd817
Merge: d9d77db 14da5f7
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 4 09:34:05 2013 -0700

    Merge "Apollo: EL translation" into cm-10.1

commit d9d77db110e111aaddf745b9ab6dde1d946cda52
Merge: aae1c45 5061b75
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri May 3 16:33:17 2013 -0700

    Merge "Apollo : FR translation" into cm-10.1

commit 14da5f783fbd4f1bb7e0e81cee9338d74d308203
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Thu May 2 23:59:02 2013 +0300

    Apollo: EL translation

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: Ibd6a060bc06a6cb5867eb5e78ee9b935b09cc181

commit aae1c4506457bb72ee5e2c0462f0bc58bbd94ba7
Merge: 19154ef 0d0769f
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon Apr 29 11:54:17 2013 -0700

    Merge "Apollo: HU update translations" into cm-10.1

commit 19154efa41831f792402f344f76399bd89a4e44b
Author: Darren Salt <devspam@moreofthesa.me.uk>
Date:   Mon Apr 29 15:42:37 2013 +0100

    en_GB localisation.

    Change-Id: I229f07bea760a43a5a13a5ab75f05b3e19033f7e

commit c83035580d747a57c15f8c3001b6484023f7a9a0
Merge: 432c827 ceda239
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 29 00:58:43 2013 -0700

    Merge "Add support for playing files and playlists via intent." into cm-10.1

commit 0d0769f7cb03fe8b880b85e6a842a5d3518b08dd
Author: Tamás Tóth <syman@babulus.hu>
Date:   Mon Apr 29 09:41:39 2013 +0200

    Apollo: HU update translations

    Change-Id: I7f802eb497a470a5cb08e5638bf9fafbb11a8e55

commit 432c82759c5c0a6da15ee78169ab02605bffab1e
Merge: 899ca66 aa62e73
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 28 00:54:00 2013 -0700

    Merge "Apollo: Update italian translation" into cm-10.1

commit aa62e73ab192063b252afa98fd678fb23a6a1ffe
Author: Francesco <francescoforesta@email.it>
Date:   Sat Apr 27 13:22:13 2013 +0200

    Apollo: Update italian translation

    Change-Id: I5ffc45e1ac255daeec9e98b17d33acf13422be67

commit 899ca66cb3e7eb1d415c66937722c08186ebb4c0
Author: djMesias <djmesias@terra.es>
Date:   Sat Apr 27 01:14:22 2013 +0200

    Apollo: ES translations

    - Singular favorite translation

    Change-Id: I5b3ff05cbff992c5834f4665965202b5f4cfa85f

commit 019f89b138c997e65e1024db93be2370c082d06a
Merge: f03bfef e2a49d5
Author: Andrew Neal <andrewdneal@gmail.com>
Date:   Fri Apr 26 20:43:57 2013 -0700

    Merge "Improve app widget layouts." into cm-10.1

commit 5061b7599391c2a1a5b5bf33d8ec74cffb22383b
Author: DelPETER <delphinpeter@gmail.com>
Date:   Fri Apr 26 16:03:31 2013 +0200

    Apollo : FR translation

    Change-Id: Iefddb7e18ca5955d46a23055e9d9d37291a1954e

commit f03bfefe06788cc2a746ccc4a44515873b810f53
Merge: 0e950db 937dd0b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Apr 26 06:17:44 2013 -0700

    Merge "Make sure to not overflow thread pool." into cm-10.1

commit 0e950dba38b337a220c9d64b127ae36d67c1714a
Merge: 5d80be5 18b3d93
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Apr 26 06:16:47 2013 -0700

    Merge "Init loader manager in main thread." into cm-10.1

commit 5d80be597593f29a484613ce3bedd948a2552a63
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 22 09:33:04 2013 +0200

    Fix applying the lockscreen controls setting on startup.

    settings.xml and PreferenceUtils.java were in disagreement about the key
    name.

    Change-Id: I59ab7c4a543619a00ba568fc810f72c62bd09b8f
    JIRA:CYAN-900

commit 18b3d93134fe39837e3feaadfe0d64eea3c0d53a
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 22 10:48:37 2013 +0200

    Init loader manager in main thread.

    It may initialize static handlers as a side effect, which are supposed
    to run in the main thread.

    Change-Id: I0b92e5b9e9baa78fc453884c6898421220d7f9f7
    JIRA:CYAN-704

commit 11c25031b1b99b28be62d1eb9d88542dec05b873
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 22 09:44:42 2013 +0200

    Assorted typo fixes.

    Change-Id: I57f2200ea2dea6109751fb6774f93262573c7b49

commit ad3ea55db37a4c320e8aed78baf6403f4e355908
Merge: 28eeddd c696b30
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Apr 26 06:13:51 2013 -0700

    Merge "Don't assume the difference between the singular and plural is only 1 character." into cm-10.1

commit e2a49d5517e6a6c5ef336e3fc7bd546654666155
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 25 14:20:54 2013 +0200

    Improve app widget layouts.

    Make them cope with larger-than-usual font sizes, and simplify them in
    the process.

    Change-Id: Iee42b68bb9907838b6c933f046503aacb8259daf
    JIRA:CYAN-779

commit 28eeddd2a7ffd163ce3216bbe3d61c0925958d78
Merge: 07810c4 a273f60
Author: Andrew Neal <andrewdneal@gmail.com>
Date:   Thu Apr 25 21:22:55 2013 -0700

    Merge "Fix up app widget background drawables." into cm-10.1

commit 07810c4e659b64dde1c70ce22ed2a9a9bc1055fc
Merge: 9a23615 98bf6f4
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 24 11:59:56 2013 -0700

    Merge "Apollo: Danish translation" into cm-10.1

commit ceda23935ebd1870eb8a85ec1d78db7bc0875910
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Apr 23 11:33:41 2013 +0200

    Add support for playing files and playlists via intent.

    Change-Id: I3a4be1d2eec159f47adcd9d7e9dae529ba1dbf35

commit c696b303677fcf09cd466574239fd2f7321ce69d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Apr 23 09:27:20 2013 +0200

    Don't assume the difference between the singular and plural is only 1
    character.

    E.g. in German, it's Favorit vs. Favoriten.

    Change-Id: I39780574ab69d0c3f9e51343e37ec9540510025c

commit 937dd0bc4d3ef8491e9fb087ba052f9f7b775b0e
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 22 09:30:17 2013 +0200

    Make sure to not overflow thread pool.

    When the image fetcher tasks are paused, adding new tasks can lead to
    thread pool overflow. Avoid adding new tasks in that case.

    Change-Id: I5b97ab8bd204b22af7eb57c388e2bb2796cde193
    JIRA:MC-1

commit a273f60fcdc029ed7f37cba224d96429c657466d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 22 10:58:18 2013 +0200

    Fix up app widget background drawables.

    There was a mixup when converting Apollo to API 14+ only: The drawables
    targeted for API level < 11 were incorrectly used. Fix that by restoring
    the drawables targeted for API level >= 11.

    Change-Id: I8d2dee470ec949c905b8a9e4b5f64317cddc911b
    JIRA:CYAN-779

commit 9a236155dde91494c58ff2be14642bcc1fc38e4b
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 21 22:22:42 2013 +0200

    Apollo: Fix aapt warnings

    Change-Id: Id86788a0c07c866e7c0f460fb13b4f3782f0348d

commit 98bf6f4208636eb3e7511e9be18b99dd6b35a7b7
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Fri Apr 19 18:30:44 2013 +0200

    Apollo: Danish translation

    Patchset 2: Changes based on reviews. Thanks for spotting 2 obvious errors.

    Change-Id: I2e7df9f082ce1e05ed3a3f44f58c681d21413270

commit e041e12977f329607faa5977173480197ffb22a9
Merge: fce6e05 c2a551b
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 19 14:11:12 2013 -0700

    Merge "Add Apollo uk_UA translation" into cm-10.1

commit fce6e05b5a2caafa970ff4ba5aab6d3edd8cf8a4
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Thu Apr 18 16:22:13 2013 +0300

    Apollo: Remove non-translatable strings

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I3607dc6028cd37d259059564f5982f48477736d0

commit 56095a518f6cc28f7941aab1a7d44eb1d8b51f5a
Merge: 3499e32 f84b2da
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 18 00:23:03 2013 -0700

    Merge "Adding translatable false tag to some lines" into cm-10.1

commit f84b2da5817f4217fd0fa15e926628eccf8e298c
Author: Tamás Tóth <syman@babulus.hu>
Date:   Thu Apr 18 09:07:40 2013 +0200

    Adding translatable false tag to some lines

    Change-Id: Ib6fc41c9825cb1cd79974934ac34df5393627df7

commit 3499e32ed177f78ae684b46d9a60ea4c76ac25f3
Author: Vasilis Akritas <billak75@gmail.com>
Date:   Sat Mar 30 18:15:26 2013 +0200

    Apollo: Add Greek Translation

    Patchset 3: Some spelling fixes & finish translation
                Minor corrections to align with overrall system translation

    Patchset 4: Remove comments as part of the new translation policy
                Correct playlist_last_added

    Patchset 5: Final corrections

    Change-Id: Ic744f0b717602276094b930d6917872af00177ea

commit fc0c6d79ed68f68516e9e03983ace5983026d51d
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Mon Apr 15 20:20:10 2013 +0200

    Apollo: Added Norwegian translation

    Added Norwegian translation for Apollo

    Patch Set 2: Fixed some typos...
    Patch Set 3: Added a missing 'e'

    Change-Id: I0022c8ee211bbd2adf05542930010721cd3bb37d

commit c2a551bd1689bd8067114eb289da279d6b30fbb4
Author: Vavooon <vavooon@gmail.com>
Date:   Mon Apr 15 00:16:23 2013 +0300

    Add Apollo uk_UA translation

    Change-Id: If4cf2780cbff48a2cf8fb5812d74b2cd392f7ea6

commit d17070a7ed3475ae68690cedee73d3fc4d84106e
Merge: 175c57e a7e4a6b
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 12 14:23:33 2013 -0700

    Merge "Apollo: updated Finnish translation" into cm-10.1

commit 175c57e6f1a8404804f18ef030bde8242c8f3d94
Author: Gustavo <gustavo@gustavo.ca>
Date:   Thu Apr 11 07:15:16 2013 -0700

    PT-BR: Update translation

    Change-Id: I123e5ff20ba17a32a87faa3c60bbedff5acb2804

commit 7e1d2506308270f1825de83da28a2f0c28577921
Merge: aeab327 1a339a3
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 10 11:58:54 2013 -0700

    Merge "PT-BR: Update translation" into cm-10.1

commit aeab3270fcb78e7a43396257c385528f94527027
Merge: d288d66 76666c8
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 10 11:57:11 2013 -0700

    Merge "Apollo: NL translations" into cm-10.1

commit 1a339a3b4b81ec0cd4d4b59c909d0860befc7d63
Author: Gustavo <gustavo@gustavo.ca>
Date:   Mon Apr 8 02:04:47 2013 -0700

    PT-BR: Update translation

    Change-Id: I4e317518340d32ad2194bc9aaa9daf737e7b0b0c

commit d288d66bfedf282147c0ee81b02bc292a8b817ff
Merge: cfe676e 8d9ed32
Author: Andrew Neal <andrewdneal@gmail.com>
Date:   Sat Apr 6 18:48:39 2013 -0700

    Merge "Apollo: Disable hardware acceleration in ColorPickerView" into cm-10.1

commit 76666c872bd479291b695035455b013363b9d307
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Mar 30 21:51:54 2013 +0100

    Apollo: NL translations

    Change-Id: I9cd84c71207a4fbb5346becc2e130f9b82af84a9

commit cfe676efeaca7447fdedf89a46ea9cd77faf8212
Merge: 7760110 19d08ef
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 5 16:43:12 2013 -0700

    Merge "Update Russian Translation-Apollo-CM10.1" into cm-10.1

commit 7760110ae5f6342e3af89c63586e9ccdb4e48828
Author: Francesco <francescoforesta@email.it>
Date:   Fri Apr 5 21:11:43 2013 +0200

    Apollo: Update italian translation

    Change-Id: I4763885cc4473987e83eff5af39357f0a7c5488a

commit 19d08ef6e4d7eab51587d268618f6c12b19ecfb6
Author: pvolkov <marshmollow@gmail.com>
Date:   Thu Apr 4 20:34:29 2013 +0400

    Update Russian Translation-Apollo-CM10.1

    Update Russian Translation-CM10.1

commit 5a046717152285c41c9cd586b5ac9ffa9e44af03
Merge: 43e8989 09d32e3
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu Apr 4 07:15:19 2013 -0700

    Merge "Apollo: improve default translations" into cm-10.1

commit 43e89894b2876776c4c246e63d37d7062ee4c7c8
Merge: 7729ed8 4399448
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 4 06:17:05 2013 -0700

    Merge "Apollo: Add Simplified Chinese Translations" into cm-10.1

commit 09d32e3d6496a9f6e9673d5153b5a141356644bd
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 2 15:35:36 2013 +0200

    Apollo: improve default translations

    Change-Id: I77ddc4bd3b347707ea429542721f2c55fee3c880

commit 7729ed8671b7ecf9135b016b502aa7f86b34f41b
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Tue Apr 2 11:04:03 2013 +0200

    Apollo: Update German translation

    Patch Set 1:   * make strings more consistens to
                     Google Play Music and other well known music apps

    Patch Set 2:   * revert some changes

    Change-Id: I8bdc298deb2261a9e5f2a65465bdbccdbaf0d1b9

commit 8d9ed32c0d2cb827c7dd84d34279c2a71d1d6ae8
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Sun Mar 31 23:55:41 2013 +0200

    Apollo: Disable hardware acceleration in ColorPickerView

    http://developer.android.com/guide/topics/graphics/hardware-accel.html

    << ComposeShader can only contain shaders of different types (a BitmapShader and a
    LinearGradient for instance, but not two instances of BitmapShader)'. But, 'If your
    application is affected by any of these missing features or limitations, you can turn
    off hardware acceleration for just the affected portion of your application by calling
    setLayerType(View.LAYER_TYPE_SOFTWARE, null). >>

    Patchset 2: Move setLayerType to ApolloUtils
    Patchset 3: Untouch ColorPickerView

    Change-Id: I6979051a8d8e4f6cd3dc5ad5dc4736c3adf8ec79
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

commit 3506c4bee729a3320fc6435f1d40f9dbc3c014e0
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Mon Apr 1 00:01:05 2013 +0200

    Apollo: Fix afrikaans aapt warning

    Change-Id: Ic3eef27501ae1de759ac3c4a670a2d8b1964981b
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

commit 1003a7f4761a8727e6070795d44cbc962f12c6ef
Merge: 2584c7e c1dfdc8
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Mar 30 12:41:21 2013 -0700

    Merge "Add Afrikaans translation" into cm-10.1

commit 2584c7e309e145710ca3ff51b6713dc1ae92c503
Author: Buga Dániel <bugadani@gmail.com>
Date:   Tue Mar 26 13:06:31 2013 +0100

    Fix notification widget start

    When starting playback first from a widget, the notification controls aren't
    displayed. This commit should fix that and also clean up the code a bit.

    Change-Id: Ic8463a16dd1d930540eb8d4c2ff2e1be26666b94

commit c1dfdc8019ba7c6d5c40f31c8b982af210cd0013
Author: isimobile <isimobile@ismaakit.com>
Date:   Tue Mar 26 21:10:23 2013 +0200

    Add Afrikaans translation

    Translated new version of Apollo to Afrikaans

    Change-Id: I701cab6ee73741a6e5f57c1737a0b374f7d8e53a

commit 467b22678c75a399f09051a4ee816fb426e7b6b1
Merge: 21c8304 271e07a
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Mar 22 02:28:23 2013 -0700

    Merge "Japanese : Initial Japanese translation for new Applo." into cm-10.1

commit 21c8304a268e879e4f791bcf8ebcfa48b1d2c659
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Mar 22 09:13:54 2013 +0100

    Fix up bitmap config check.

    Instead of throwing away (otherwise valid) bitmaps if their config
    doesn't fit any predefined one, convert them on the fly.

    Change-Id: I2842a59fdc68f2f954c189ba6925eeeab33d4633

commit c549f66fbc861999268990567884bd410fee3511
Author: Buga Dániel <bugadani@gmail.com>
Date:   Thu Mar 21 19:30:28 2013 +0100

    Invert Play/Pause buttons in Notification widget

    The logical behaviour of the "Play" button is to actually play a song
    when pressed. The current behaviour is to pause the song and the "Pause"
    button resumes the playback.

    Change-Id: Ib432bfe6c214e38196a25b00fbbc8fbfbc031ca7

commit a7e4a6b6cc700eb7a4805046e1cfeb1eac593e39
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Thu Mar 21 20:29:01 2013 +0200

    Apollo: updated Finnish translation

    Change-Id: I593fd642a596c43e5a6cf99fdb74e0ebb35bb863

commit 22bcf1cc3de3c1d483464f1e5acaa2c35b29deff
Author: Buga Dániel <bugadani@gmail.com>
Date:   Thu Mar 21 18:51:05 2013 +0100

    Fix NPE

    Prevent ImageFetcher to return a Bitmap with null Config.

    Change-Id: I8c9ace7ffa6f851524ce5c7b098ecf2c6768ac52

commit 271e07aeb50832ab988be03dd3128b8c04e98bd5
Author: Takuo Kitame <kitame@gmail.com>
Date:   Thu Mar 21 18:22:59 2013 +0900

    Japanese : Initial Japanese translation for new Applo.

    patch-2: revise and add plurals.xml

    Change-Id: Ifa935ebc99e04225584967766eaaf37eb34f5407

commit 18a53aed3906d67fff5f63c699b1fe5e8f058898
Merge: d6608d8 4439577
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Mar 20 12:32:02 2013 -0700

    Merge "Added Russian Translation-Apollo-CM10.1" into cm-10.1

commit d6608d8cb1b272908ac81e8bed0821b607385928
Merge: f4d9084 4442fd4
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Mar 20 02:02:17 2013 -0700

    Merge "es_ES: Add spanish translations" into cm-10.1

commit f4d90840b618edd194a9fa01f1b7de3a664a3a69
Merge: d18ad89 c7eca53
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Mar 20 02:01:45 2013 -0700

    Merge "Apollo: Update italian translation" into cm-10.1

commit d18ad8965276001ea5e329eeb186d6400d7f9ae2
Merge: b49e644 86e4d7c
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Mar 20 02:01:36 2013 -0700

    Merge "Apollo: Update italian translation" into cm-10.1

commit b49e64494d3f4e937b948c1fed53253f8a54f9b7
Merge: d8f455b c08a0d2
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Mar 20 02:01:17 2013 -0700

    Merge "Apollo: Added Polish language" into cm-10.1

commit d8f455be507c47da4036e7031ec2d80b2f945beb
Merge: ee2d96e d1c2c6d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Mar 20 02:00:43 2013 -0700

    Merge "Apollo: Add French translation" into cm-10.1

commit ee2d96eae509400bb2e89391835611fec6380a73
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Mar 18 11:39:27 2013 +0100

    Add German translation.

    Change-Id: I4614e58cea699b333990783dfbd7120b8921a126

commit 4399448f04811e0e14d621f7f854005e14cd6f8b
Author: YuanQY <yuanqingyun@gmail.com>
Date:   Sun Mar 17 13:08:07 2013 +0800

    Apollo: Add Simplified Chinese Translations

    Patch Set 2: Modified translationss for better accuracy, as well as
    updated the copyright header as per Marco's request.
    Patch Set 4: Merge http://review.cyanogenmod.org/34016, clean up unused
    string.
    Patch Set 5: Merge  http://review.cyanogenmod.org/#/c/34016/ and
    http://review.cyanogenmod.org/#/c/34020/, add translation for
    plurals.xml
    Patch Set 6: Merge the translation in Patch Set 3 and fix some incorrectness translation.

    Change-Id: I8d26ef1d887b40a1d058441cb0985a3dcbeb50d4

commit 4439577dc8ab957e38061f8e1c94efae8483a5b9
Author: pvolkov <marshmollow@gmail.com>
Date:   Sun Mar 17 14:45:06 2013 +0400

    Added Russian Translation-Apollo-CM10.1

    Added Russian Translation-Fixes-CM10.1

    Added Russian Translation-Fixes-CM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-Added plurals.xmlCM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-CM10.1

commit c08a0d27d26d296cf1a4f17a07a073472daacc38
Author: tompopielarczyk <popielarczyktomasz@gmail.com>
Date:   Sun Mar 17 22:30:05 2013 +0100

    Apollo: Added Polish language

    Patch Set 2: Formating and headers synced with latest merged changes of values
    Patch Set 3: Correction
    Patch Set 4: Fixed a typo
    Patch Set 5: Synced with latest merged changes
    Patch Set 6: Fixed a typo
    Patch Set 7: Fixed a typo

    Change-Id: I84350b3440e379f20345d4ec9d1d40e816f98395

commit 400df99e6eb2f0c75990df4969edc6ffed042567
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Mar 19 14:05:15 2013 +0100

    Fix crash

    Change-Id: I1e8e693676d14ebca6f1c54773ed36e20c465c00

commit 2703ec4060514d198cfdd5309515dae987233674
Author: Buga Dániel <bugadani@gmail.com>
Date:   Tue Mar 19 13:55:14 2013 +0100

    Convert line endings

    Change-Id: I16eeea17b850f411e7031c79da06de628675e977

commit 4442fd483118e316b5cf05a15f67f98fed5c9a04
Author: djMesias <djmesias@terra.es>
Date:   Sun Mar 17 21:19:24 2013 +0100

    es_ES: Add spanish translations

    Change-Id: I687d4fc310b74046cb878dec20778a5e6f5a04cf

commit 4c8eebed1ae498cbed3ea3e71ae8d94eabf3ad65
Author: Buga Dániel <bugadani@gmail.com>
Date:   Sun Mar 17 17:52:55 2013 +0100

    Apollo: Hungarian translations

    Patch Set 2: Corrections based on Danny Baumann's changes.

    Change-Id: I930db39f2ce4b8a73b03a8cdf5561626263e6d5d

commit c7eca53fcd59fa54193a9f98cc9f3e0731463c69
Author: Francesco <francescoforesta@email.it>
Date:   Mon Mar 18 19:26:27 2013 +0100

    Apollo: Update italian translation

    Change-Id: I54746a77b658187dfceeaeee56d89fabe418291a

commit d1c2c6dfa1e499a9f724204a4ba9b32a61bc556d
Author: xavihernandez <emourougandy@gmail.com>
Date:   Sun Mar 17 22:23:16 2013 +0100

    Apollo: Add French translation

        * Patch Set 1: initial commit
        * Patch Set 2: correction
        * Patch Set 3: update
        * Patch Set 4: correction
        * Patch Set 5: correction (sry Delphin)

    Change-Id: I4dcdae1bf85e5dc4ba0c9e7eb043c865ad32f9aa

commit 81c7ae7bcfeb83eb16bbc65bce74b352c284ad70
Merge: 3e27a6b 30aaeb9
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Mar 18 08:08:56 2013 -0700

    Merge "Apollo: Don't reduce visibility of hasDividerBeforeChildAt" into cm-10.1

commit 3e27a6b6263d1f72e3a555f89f17116a3f50caad
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Mar 18 15:44:47 2013 +0100

    Improve translability of some items.

    In particular, don't assume a certain word order, e.g. in 'Delete
    album?'.

    Change-Id: I8271ea80c36763869a2c4643509b773e17d10e6c

commit dfce2d1f7f95c1a2d61e7ca36d75388b8cd45cd0
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Mar 18 11:49:48 2013 +0100

    Remove unused strings.

    Change-Id: If2a554cd41bf1fb1524d1a39f4d92bb861bdf693

commit 86e4d7c0d998f872aa417b4549ebc574d3fe3a55
Author: Francesco <francescoforesta@email.it>
Date:   Sun Mar 17 12:56:06 2013 +0100

    Apollo: Update italian translation

    Change-Id: Iaa66535fa8bea0c17cc7ba5c5fd327ae8af61295

commit 30aaeb94b0759ac2ee03da31e6182826f732bfc0
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Sun Mar 17 12:47:44 2013 +0100

    Apollo: Don't reduce visibility of hasDividerBeforeChildAt

    Change-Id: I0e01f63ad21cab0c82ef5ff91bf86ce03812226b
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I68deb29bb90647435176605b089b3533c3bf7e60