From 7bc5f91289e4179a84bd9a6ec7d62d9abc681053 Mon Sep 17 00:00:00 2001 From: JeiFeng Lee Date: Thu, 2 May 2019 08:32:01 +0800 Subject: [PATCH] [PATCH] Buttons in storage settings Due to changes in layout of storage wizard base, 2 extra buttons are shown on progress screen while formatting SD card and also on other screens which have storage wizard base as their super class. Hence when these buttons were clicked unsupported exception takes place. Hide these unnecessary next/back buttons from all screen so that user cannot click these. Fixes: 131779469 Test: manual Change-Id: I235a180627e68bbb38f4ed4e7ac58ae38838c8d7 Signed-off-by: JeiFeng Lee --- .../android/settings/deviceinfo/StorageWizardBase.java | 8 ++++++++ .../settings/deviceinfo/StorageWizardFormatProgress.java | 4 +++- .../android/settings/deviceinfo/StorageWizardInit.java | 2 +- .../settings/deviceinfo/StorageWizardMigrateProgress.java | 4 +++- .../settings/deviceinfo/StorageWizardMoveConfirm.java | 1 + .../settings/deviceinfo/StorageWizardMoveProgress.java | 4 +++- .../android/settings/deviceinfo/StorageWizardReady.java | 1 + 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index 38733891901..92afa56cc0a 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -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(); diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 1e8c1691bc2..88968b3bd2a 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -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(); diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java index 4f9c5e7aba0..426395c24fe 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardInit.java +++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java @@ -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); diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java index 60f3cb5d4cb..b6f2a8d2fa4 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java @@ -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); diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java index 10b78af0d7a..8dc878e24af 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java @@ -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 diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index 27fa9beb532..1966c9534ae 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager.MoveCallback; import android.os.Bundle; import android.os.Handler; import android.util.Log; +import android.view.View; import android.widget.Toast; import com.android.settings.R; @@ -49,7 +50,8 @@ public class StorageWizardMoveProgress extends StorageWizardBase { setIcon(R.drawable.ic_swap_horiz); setHeaderText(R.string.storage_wizard_move_progress_title, appName); setBodyText(R.string.storage_wizard_move_progress_body, volumeName, appName); - + 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); diff --git a/src/com/android/settings/deviceinfo/StorageWizardReady.java b/src/com/android/settings/deviceinfo/StorageWizardReady.java index fdb8d8a4938..813bcc6e201 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardReady.java +++ b/src/com/android/settings/deviceinfo/StorageWizardReady.java @@ -50,6 +50,7 @@ public class StorageWizardReady extends StorageWizardBase { } setNextButtonText(R.string.done); + setBackButtonVisibility(View.INVISIBLE); } @Override