Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 671fa153 authored by Arc Wang's avatar Arc Wang Committed by Gerrit Code Review
Browse files

Merge "Crash happens if back button is pressed during "Format as Portable""

parents 81d1cd08 9a72877c

src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java

+11 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java

+11 −0
Original line number Diff line number Diff line
@@ -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";
@@ -47,6 +49,15 @@ public class StorageWizardMigrateProgress extends StorageWizardBase { 
        }

        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);