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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-08 16:35:12 +00:00
committed by Android (Google) Code Review
parent 1079d2833a 7bc5f91289
commit d88ca05b2e
7 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

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

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

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

2
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

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

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

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

1
src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
View File

@@ -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

4
src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
View File

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

1
src/com/android/settings/deviceinfo/StorageWizardReady.java
View File

@@ -50,6 +50,7 @@ public class StorageWizardReady extends StorageWizardBase {
}
setNextButtonText(R.string.done);
setBackButtonVisibility(View.INVISIBLE);
}
@Override