PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arc Wang
2022-08-02 03:45:28 +00:00
committed by Automerger Merge Worker
parent 244f21d9d7 6945e70c02
commit c80890c7dd
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
View File

@@ -36,6 +36,7 @@ import com.android.settings.R;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import android.view.WindowManager;
public class StorageWizardFormatProgress extends StorageWizardBase {
private static final String TAG = "StorageWizardFormatProgress";
@@ -54,6 +55,16 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
return;
}
setContentView(R.layout.storage_wizard_progress);
// hide the navigation bar for this activity only. So that user can not press back button accidentally.
View decorView = getWindow().getDecorView();
int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
decorView.setSystemUiVisibility(uiOptions);
//disable touch in activity so user can not make the hidden navigation bar visible.
getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
setKeepScreenOn(true);
mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);

11
src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
View File

@@ -31,6 +31,8 @@ import android.widget.Toast;
import com.android.settings.R;
import android.view.WindowManager;
public class StorageWizardMigrateProgress extends StorageWizardBase {
private static final String TAG = "StorageWizardMigrateProgress";
@@ -46,7 +48,16 @@ public class StorageWizardMigrateProgress extends StorageWizardBase {
return;
}
setContentView(R.layout.storage_wizard_progress);
// hide the navigation bar for this activity only. So that user can not press back button accidentally.
View decorView = getWindow().getDecorView();
int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
decorView.setSystemUiVisibility(uiOptions);
//disable touch in activity so user can not make the hidden navigation bar visible.
getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
mMoveId = getIntent().getIntExtra(EXTRA_MOVE_ID, -1);
setIcon(R.drawable.ic_swap_horiz);