Merge "Improve the layout of the installation page" into main
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
index a9102b0..0774bb1 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
@@ -29,12 +29,15 @@
import android.os.RemoteException;
import android.text.format.Formatter;
import android.util.Log;
+import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+
import java.lang.ref.WeakReference;
import java.util.concurrent.ExecutorService;
@@ -128,6 +131,12 @@
private void setInstallEnabled(boolean enable) {
mInstallButton.setEnabled(enable);
mWaitForWifiCheckbox.setEnabled(enable);
+ LinearProgressIndicator progressBar = findViewById(R.id.installer_progress);
+ if (enable) {
+ progressBar.setVisibility(View.INVISIBLE);
+ } else {
+ progressBar.setVisibility(View.VISIBLE);
+ }
int resId =
enable
diff --git a/android/TerminalApp/res/drawable/ic_lock_open.xml b/android/TerminalApp/res/drawable/ic_lock_open.xml
deleted file mode 100644
index c623592..0000000
--- a/android/TerminalApp/res/drawable/ic_lock_open.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
- android:viewportWidth="960"
- android:viewportHeight="960"
- android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M220,326L610,326L610,230Q610,175.83 572.12,137.92Q534.24,100 480.12,100Q426,100 388,137.92Q350,175.83 350,230L290,230Q290,151 345.61,95.5Q401.21,40 480.11,40Q559,40 614.5,95.58Q670,151.15 670,230L670,326L740,326Q764.75,326 782.38,343.62Q800,361.25 800,386L800,820Q800,844.75 782.38,862.37Q764.75,880 740,880L220,880Q195.25,880 177.63,862.37Q160,844.75 160,820L160,386Q160,361.25 177.63,343.62Q195.25,326 220,326ZM220,820L740,820Q740,820 740,820Q740,820 740,820L740,386Q740,386 740,386Q740,386 740,386L220,386Q220,386 220,386Q220,386 220,386L220,820Q220,820 220,820Q220,820 220,820ZM480.17,680Q512,680 534.5,657.97Q557,635.94 557,605Q557,575 534.33,550.5Q511.66,526 479.83,526Q448,526 425.5,550.5Q403,575 403,605.5Q403,636 425.67,658Q448.34,680 480.17,680ZM220,820Q220,820 220,820Q220,820 220,820L220,386Q220,386 220,386Q220,386 220,386L220,386Q220,386 220,386Q220,386 220,386L220,820Q220,820 220,820Q220,820 220,820Z"/>
-</vector>
-
diff --git a/android/TerminalApp/res/drawable/ic_terminal.xml b/android/TerminalApp/res/drawable/ic_terminal.xml
new file mode 100644
index 0000000..92030e0
--- /dev/null
+++ b/android/TerminalApp/res/drawable/ic_terminal.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="142"
+ android:viewportHeight="168.75">
+ <group android:translateY="133.59375">
+ <path android:pathData="M9.078125,-77.484375L69.75,-51.40625L69.75,-37.765625L9.078125,-11.609375L9.078125,-28.40625L52.53125,-44.71875L9.078125,-60.75L9.078125,-77.484375Z"
+ android:fillColor="#3BBA46"/>
+ <path android:pathData="M139.76562,0L139.76562,13.5L75.21875,13.5L75.21875,0L139.76562,0Z"
+ android:fillColor="#3BBA46"/>
+ </group>
+</vector>
\ No newline at end of file
diff --git a/android/TerminalApp/res/layout/activity_installer.xml b/android/TerminalApp/res/layout/activity_installer.xml
index c375cb8..d5849f4 100644
--- a/android/TerminalApp/res/layout/activity_installer.xml
+++ b/android/TerminalApp/res/layout/activity_installer.xml
@@ -1,56 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
- <TextView
- android:id="@+id/installer_title"
- android:layout_width="match_parent"
+ android:fitsSystemWindows="true">
+
+ <com.google.android.material.progressindicator.LinearProgressIndicator
+ android:id="@+id/installer_progress"
+ android:indeterminate="true"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
- android:textSize="32sp"
- android:text="@string/installer_title_text" />
+ android:visibility="invisible"
+ />
<ImageView
- android:id="@+id/installer_icon"
- android:layout_width="match_parent"
- android:layout_height="300dp"
- android:padding="10dp"
- android:layout_below="@id/installer_title"
+ android:id="@+id/installer_terminal_icon"
+ android:layout_width="30dp"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_terminal"
+ android:adjustViewBounds="true"
android:layout_alignParentStart="true"
- android:src="@drawable/ic_lock_open"
- android:adjustViewBounds="true" />
+ android:layout_marginTop="48dp"
+ android:layout_marginLeft="32dp"
+ android:layout_marginRight="32dp"
+ app:tint="?attr/colorPrimary" />
+
+ <TextView
+ android:id="@+id/installer_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="false"
+ android:text="@string/installer_title_text"
+ android:layout_below="@id/installer_terminal_icon"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="24dp"
+ android:layout_marginLeft="32dp"
+ android:layout_marginRight="32dp"
+ android:textSize="36sp" />
<TextView
android:id="@+id/installer_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dp"
- android:layout_below="@id/installer_icon"
- android:layout_alignParentStart="true"
android:singleLine="false"
- android:textSize="24sp" />
+ android:layout_below="@id/installer_title"
+ android:lineSpacingExtra="5dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginLeft="32dp"
+ android:layout_marginRight="32dp"
+ android:textSize="16sp" />
<CheckBox
android:id="@+id/installer_wait_for_wifi_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="10dp"
+ android:textSize="16sp"
+ android:layout_marginLeft="42dp"
+ android:layout_marginRight="42dp"
+ android:layout_above="@id/installer_install_button"
android:layout_alignParentEnd="true"
- android:layout_below="@id/installer_desc"
android:text="@string/installer_wait_for_wifi_checkbox_text" />
<Button
android:id="@+id/installer_install_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="10dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
+ android:layout_marginBottom="32dp"
+ android:layout_marginLeft="40dp"
+ android:layout_marginRight="40dp"
+ android:backgroundTint="?attr/colorPrimaryDark"
android:text="@string/installer_install_button_enabled_text" />
-
</RelativeLayout>