Merge "Support release mode in build.sh" 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 0774bb1..1abba85 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
@@ -32,11 +32,11 @@
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 com.google.android.material.snackbar.Snackbar;
import java.lang.ref.WeakReference;
import java.util.concurrent.ExecutorService;
@@ -110,10 +110,10 @@
public void handleCriticalError(Exception e) {
if (Build.isDebuggable()) {
- Toast.makeText(
- this,
+ Snackbar.make(
+ findViewById(android.R.id.content),
e.getMessage() + ". File a bugreport to go/ferrochrome-bug",
- Toast.LENGTH_LONG)
+ Snackbar.LENGTH_INDEFINITE)
.show();
}
Log.e(TAG, "Internal error", e);
@@ -189,9 +189,9 @@
@MainThread
private void handleError(String displayText) {
- // TODO(b/375542145): Display error with snackbar.
if (Build.isDebuggable()) {
- Toast.makeText(this, displayText, Toast.LENGTH_LONG).show();
+ Snackbar.make(findViewById(android.R.id.content), displayText, Snackbar.LENGTH_LONG)
+ .show();
}
setInstallEnabled(true);
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index ebf6154..fdf1f3b 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -88,7 +88,7 @@
private AccessibilityManager mAccessibilityManager;
private ConditionVariable mBootCompleted = new ConditionVariable();
private static final int POST_NOTIFICATIONS_PERMISSION_REQUEST_CODE = 101;
- private ActivityResultLauncher<Intent> manageExternalStorageActivityResultLauncher;
+ private ActivityResultLauncher<Intent> mManageExternalStorageActivityResultLauncher;
private static int diskSizeStep;
@Override
@@ -122,27 +122,17 @@
readClientCertificate();
connectToTerminalService();
- manageExternalStorageActivityResultLauncher =
+ mManageExternalStorageActivityResultLauncher =
registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
(ActivityResult result) -> {
- if (Environment.isExternalStorageManager()) {
- Toast.makeText(this, "Storage permission set!", Toast.LENGTH_SHORT)
- .show();
- } else {
- Toast.makeText(
- this,
- "Storage permission not set",
- Toast.LENGTH_SHORT)
- .show();
- }
startVm();
});
// if installer is launched, it will be handled in onActivityResult
if (!launchInstaller) {
if (!Environment.isExternalStorageManager()) {
- requestStoragePermissions(this, manageExternalStorageActivityResultLauncher);
+ requestStoragePermissions(this, mManageExternalStorageActivityResultLauncher);
} else {
startVm();
}
@@ -435,7 +425,7 @@
finish();
}
if (!Environment.isExternalStorageManager()) {
- requestStoragePermissions(this, manageExternalStorageActivityResultLauncher);
+ requestStoragePermissions(this, mManageExternalStorageActivityResultLauncher);
} else {
startVm();
}