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

Update storage wizard to latest UX mocks.

Browse Source 
Mostly shuffling around strings and layouts.  Slow device warning is
now a full-screen activity, and format warning is now a dialog.

Bug: 76097999
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: Ifd74e3b1389f0cc9590f6a6a2cd49671f3bbc746
This commit is contained in:
Jeff Sharkey
2018-04-01 18:25:54 -06:00
parent 47c2eebc85
commit 2af67a9302
31 changed files with 972 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,12 @@ package com.android.settings.deviceinfo;
import android.os.Bundle;
import android.os.storage.VolumeInfo;
import android.view.View;
import com.android.settings.R;
public class StorageWizardReady extends StorageWizardBase {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -31,27 +33,23 @@ public class StorageWizardReady extends StorageWizardBase {
}
setContentView(R.layout.storage_wizard_generic);
setHeaderText(R.string.storage_wizard_ready_title, mDisk.getDescription());
setHeaderText(R.string.storage_wizard_ready_title, mDisk.getShortDescription());
// TODO: handle mixed partition cases instead of just guessing based on
// first volume type we encounter
final VolumeInfo publicVol = findFirstVolume(VolumeInfo.TYPE_PUBLIC);
final VolumeInfo privateVol = findFirstVolume(VolumeInfo.TYPE_PRIVATE);
if (publicVol != null) {
setIllustrationType(ILLUSTRATION_PORTABLE);
setBodyText(R.string.storage_wizard_ready_external_body,
mDisk.getDescription());
} else if (privateVol != null) {
setIllustrationType(ILLUSTRATION_INTERNAL);
setBodyText(R.string.storage_wizard_ready_internal_body,
final boolean migrateSkip = getIntent().getBooleanExtra(EXTRA_MIGRATE_SKIP, false);
if (privateVol != null && !migrateSkip) {
setBodyText(R.string.storage_wizard_ready_v2_internal_body,
mDisk.getDescription(), mDisk.getShortDescription());
} else {
setBodyText(R.string.storage_wizard_ready_v2_external_body,
mDisk.getDescription());
}
getNextButton().setText(R.string.done);
setNextButtonText(R.string.done);
}
@Override
public void onNavigateNext() {
public void onNavigateNext(View view) {
finishAffinity();
}
}