Merge lp:~humpolec-team/humpolec/UbuntuInstaller-lp1262028 into lp:humpolec

[Rex Tsai]

UX
* Kill old activity when launch a new one. (LP: #1262028)
* s/UbuntuInstaller/Ubuntu Dual Boot/ (LP: #1262212)
* Make UbuntuTextView expand the view.

[Rex Tsai (chihchun)]

Another way to manage task stack, it's add "android:noHistory = "true"" into Androidmanifest.xml. Then the app will not keep old tasks. Back button always go back to home screen.

[Ondrej Kubik (ondrak)]

+1. We should exit current activity when switching to new one, otherwise it messes up stack.

review: Approve

=== modified file 'res/layout/ubuntu_dualboot_install.xml'
--- res/layout/ubuntu_dualboot_install.xml	2013-12-12 02:02:35 +0000
+++ res/layout/ubuntu_dualboot_install.xml	2013-12-19 09:42:54 +0000
@@ -58,16 +58,17 @@
     <com.canonical.ubuntu.widget.UbuntuTextView
         android:id="@+id/terminal"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="match_parent"
         android:layout_above="@id/progress_frame"
+        android:layout_below="@+id/title"
         android:layout_gravity="center"
         android:layout_margin="16dp"
         android:background="@color/terminalbg"
         android:ellipsize="middle"
         android:gravity="left"
+        android:maxLines="1000"
         android:padding="10dp"
-        android:maxLines = "1000"
-        android:scrollbars = "vertical"
+        android:scrollbars="vertical"
         android:text=""
         android:textColor="@color/terminaltext"
         u1f:customFont="Ubuntu-R.ttf" />

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2013-12-19 05:43:04 +0000
+++ res/values/strings.xml	2013-12-19 09:42:54 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">UbuntuInstaller</string>
+    <string name="app_name">Ubuntu Dual Boot</string>
     <string name="action_settings">Settings</string>
     <string name="action_detele_download">Delete download</string>
     <string name="action_install">Install</string>

=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-19 05:43:04 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-19 09:42:54 +0000
@@ -132,8 +132,9 @@
     private void checkIfUbuntuIsInstalled() {
         // check is there is Ubuntu installed
         if (UbuntuInstallService.isUbuntuInstalled(this.getApplicationContext())) {
-            // go to launch screen
+            // go to launch screen, and kill this activity.
             LaunchActivity.startFrom(this);
+            finish();
         }
     }
 
@@ -364,7 +365,9 @@
                     Utils.showToast(context, "Install completed");
                     mProgressBar.setProgress(100);
                     deleteDownload();
+                    // go to launch screen, and kill this activity.
                     LaunchActivity.startFrom(context);
+                    finish();
                 } else {
                     Utils.showToast(context, "Installation failed:");
                     String reason = intent.getStringExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_STR);

=== modified file 'src/com/canonical/ubuntu/installer/LaunchActivity.java'
--- src/com/canonical/ubuntu/installer/LaunchActivity.java	2013-12-19 05:43:04 +0000
+++ src/com/canonical/ubuntu/installer/LaunchActivity.java	2013-12-19 09:42:54 +0000
@@ -155,8 +155,9 @@
     private void ensureUbuntuIsInstalled() {
         VersionInfo v = UbuntuInstallService.getInstalledVersion(this.getApplicationContext());
         if (v == null) {
-            // go back to install screen
+            // go back to install screen, and release myself.
             InstallActivity.startFrom(this);
+            finish();
         } else {
             mUbuntuVersion = v;
         }