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

am 31566703: am 600cfe2f: am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

Browse Source 
* commit '3156670323c2c909a05215c464181db44abbe991':
  Refresh after clearing, tweak warn threshold.
This commit is contained in:
Jeff Sharkey
2015-07-30 19:59:20 +00:00
committed by Android Git Automerger
parent 482e570683 3156670323
commit c9a811619b
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import android.content.Intent;
import android.content.pm.IPackageMoveObserver;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
@@ -55,6 +54,7 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
return;
}
setContentView(R.layout.storage_wizard_progress);
setKeepScreenOn(true);
mFormatPrivate = getIntent().getBooleanExtra(
StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);
@@ -145,13 +145,19 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
return;
}
final float pct = (float) mInternalBench / (float) mPrivateBench;
Log.d(TAG, "New volume is " + pct + "x the speed of internal");
if (activity.mFormatPrivate) {
final float pct = (float) mInternalBench / (float) mPrivateBench;
Log.d(TAG, "New volume is " + pct + "x the speed of internal");
// TODO: refine this warning threshold
if (mPrivateBench > 2000000000) {
final SlowWarningFragment dialog = new SlowWarningFragment();
dialog.show(activity.getFragmentManager(), TAG_SLOW_WARNING);
// To help set user expectations around device performance, we
// warn if the adopted media is 0.25x the speed of internal
// storage or slower.
if (Float.isNaN(pct) || pct < 0.25) {
final SlowWarningFragment dialog = new SlowWarningFragment();
dialog.show(activity.getFragmentManager(), TAG_SLOW_WARNING);
} else {
activity.onFormatFinished();
}
} else {
activity.onFormatFinished();
}