Merge lp://staging/~karni/ubuntuone-android-music/rushed-goodies into lp://staging/ubuntuone-android-music
Proposed by
Michał Karnicki
Status: | Merged |
---|---|
Approved by: | Chad Miller |
Approved revision: | 552 |
Merged at revision: | 552 |
Proposed branch: | lp://staging/~karni/ubuntuone-android-music/rushed-goodies |
Merge into: | lp://staging/ubuntuone-android-music |
Diff against target: |
335 lines (+172/-16) 11 files modified
res/layout-land/download.xml (+1/-0) res/layout-port/download.xml (+3/-1) res/values/dimensions.xml (+1/-1) res/values/strings.xml (+6/-0) res/xml-v4/settings.xml (+83/-0) src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java (+27/-8) src/net/sourceforge/subsonic/androidapp/activity/LoginActivity.java (+6/-5) src/net/sourceforge/subsonic/androidapp/util/Compat.java (+14/-0) src/net/sourceforge/subsonic/androidapp/util/CompatAccountManager.java (+13/-0) src/net/sourceforge/subsonic/androidapp/util/Constants.java (+3/-0) src/net/sourceforge/subsonic/androidapp/util/Util.java (+15/-1) |
To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-music/rushed-goodies |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Miller (community) | Approve | ||
Review via email: mp+81223@code.staging.launchpad.net |
Description of the change
On the Thursdays evening rush to wrap U1M, this branched ended up changing quite a few things. Please look at the commits separately.
- Removes the play queue toggle button.
- Fixes portrait player layout to exclude controls area from generating gesture events.
- Removed call to overridePending
- Invalidates token only when AccountManager class is available.
- Adds setting to enable controling the player with gestures.
- Increases play queue drawer hight to make touch area easier to drag.
Gesture parts have to be refactored out to support Android 1.5.
To post a comment you must log in.