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

Commit d88ca05b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PATCH] Buttons in storage settings" into qt-dev

parents 1079d283 7bc5f912

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

+8 −0
Original line number Diff line number Diff line
@@ -187,6 +187,14 @@ public abstract class StorageWizardBase extends FragmentActivity { 
        mNext.setVisibility(View.VISIBLE);

    }



    protected void setBackButtonVisibility(int visible) {

        mBack.setVisibility(visible);

    }



    protected void setNextButtonVisibility(int visible) {

        mNext.setVisibility(visible);

    }



    protected void setIcon(int resId) {

        final GlifLayout layout = getGlifLayout();

        final Drawable icon = getDrawable(resId).mutate();

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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.SystemProperties; 
import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.util.Log;

import android.view.View;

import android.widget.Toast;



import com.android.settings.R;
@@ -59,7 +60,8 @@ public class StorageWizardFormatProgress extends StorageWizardBase { 


        setHeaderText(R.string.storage_wizard_format_progress_title, getDiskShortDescription());

        setBodyText(R.string.storage_wizard_format_progress_body, getDiskDescription());



        setBackButtonVisibility(View.INVISIBLE);

        setNextButtonVisibility(View.INVISIBLE);

        mTask = (PartitionTask) getLastCustomNonConfigurationInstance();

        if (mTask == null) {

            mTask = new PartitionTask();

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class StorageWizardInit extends StorageWizardBase { 
        mInternal = requireViewById(R.id.storage_wizard_init_internal);



        setBackButtonText(R.string.storage_wizard_init_v2_later);



        setNextButtonVisibility(View.INVISIBLE);

        if (!mDisk.isAdoptable()) {

            // If not adoptable, we only have one choice

            mInternal.setEnabled(false);

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

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.storage.DiskInfo;

import android.util.Log;

import android.view.View;

import android.widget.Toast;



import com.android.settings.R;
@@ -51,7 +52,8 @@ public class StorageWizardMigrateProgress extends StorageWizardBase { 
        setIcon(R.drawable.ic_swap_horiz);

        setHeaderText(R.string.storage_wizard_migrate_progress_v2_title);

        setAuxChecklist();



        setBackButtonVisibility(View.INVISIBLE);

        setNextButtonVisibility(View.INVISIBLE);

        // Register for updates and push through current status

        getPackageManager().registerMoveCallback(mCallback, new Handler());

        mCallback.onStatusChanged(mMoveId, getPackageManager().getMoveStatus(mMoveId), -1);

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

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase { 
        setBodyText(R.string.storage_wizard_move_confirm_body, appName, volumeName);



        setNextButtonText(R.string.move_app);

        setBackButtonVisibility(View.INVISIBLE);

    }



    @Override