Merge lp://staging/~humpolec-team/humpolec/UbuntuInstaller-refactor into lp://staging/humpolec

Proposed by Ondrej Kubik
Status: Merged
Merged at revision: 72
Proposed branch: lp://staging/~humpolec-team/humpolec/UbuntuInstaller-refactor
Merge into: lp://staging/humpolec
Diff against target: 5595 lines (+2511/-1557) (has conflicts)
37 files modified
.bzrignore (+1/-1)
Android.mk (+1/-1)
AndroidManifest.xml (+38/-12)
ant.properties (+21/-0)
assets/archive-master.tar.xz.asc (+0/-17)
assets/system-image-upgrader (+28/-156)
assets/u-reboot-app.tar.xz.asc (+0/-17)
assets/upgrade-checker (+0/-16)
build.xml (+35/-37)
check-sdk.sh (+10/-0)
make_release.sh (+0/-16)
project.properties (+1/-1)
res/layout/ubuntu_dualboot_launch.xml (+152/-104)
res/menu/installer_menu.xml (+6/-10)
res/menu/launcher_menu.xml (+19/-10)
res/values/attrs.xml (+4/-4)
res/values/colors.xml (+4/-4)
res/values/ids.xml (+26/-0)
res/values/strings.xml (+70/-14)
res/values/styles.xml (+4/-4)
src/com/canonical/ubuntu/installer/BaseActivity.java (+70/-0)
src/com/canonical/ubuntu/installer/BootReceiver.java (+39/-0)
src/com/canonical/ubuntu/installer/InstallActivity.java (+184/-160)
src/com/canonical/ubuntu/installer/JsonChannelParser.java (+38/-16)
src/com/canonical/ubuntu/installer/LaunchActivity.java (+216/-52)
src/com/canonical/ubuntu/installer/NumberPickerDialog.java (+17/-3)
src/com/canonical/ubuntu/installer/TextPickerDialog.java (+17/-1)
src/com/canonical/ubuntu/installer/UbuntuInstallService.java (+1237/-723)
src/com/canonical/ubuntu/installer/Utils.java (+245/-9)
src/com/canonical/ubuntu/installer/VersionInfo.java (+0/-141)
src/com/canonical/ubuntu/widget/UbuntuButton.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuCheckBox.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuCheckBoxPreference.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuEditText.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuEditTextPreference.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuPreference.java (+4/-4)
src/com/canonical/ubuntu/widget/UbuntuTextView.java (+4/-4)
Text conflict in AndroidManifest.xml
To merge this branch: bzr merge lp://staging/~humpolec-team/humpolec/UbuntuInstaller-refactor
Reviewer Review Type Date Requested Status
Ondrej Kubik Approve
Review via email: mp+222493@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ondrej Kubik (ondrak) wrote :

This has been dog food tested and released as version 1.0

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches