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

Show time to go while encrypting drive

Browse Source 
Bug: 15159008
Change-Id: I9bb6f86c2941cbd93572c25716d21691a4fefbef
This commit is contained in:
Paul Lawrence
2014-06-05 07:24:23 -07:00
parent 77d1f1a412
commit b15c68fbf1
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -797,6 +797,10 @@
<!-- Informational text on the progress screen while encrypting the device --> <!-- Informational text on the progress screen while encrypting the device -->
<string name="crypt_keeper_setup_description" product="default">Wait while your phone <string name="crypt_keeper_setup_description" product="default">Wait while your phone
is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string> is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
<string name="crypt_keeper_setup_time_remaining" product="tablet">Wait while your tablet
is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
<string name="crypt_keeper_setup_time_remaining" product="default">Wait while your phone
is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
<!-- Informational text on the password entry screen when password entry fails--> <!-- Informational text on the password entry screen when password entry fails-->
<string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string> <string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string>

30
src/com/android/settings/CryptKeeper.java
View File

@@ -40,6 +40,7 @@ import android.telephony.TelephonyManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -508,23 +509,40 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
return; return;
} }
int progress = 0; // Get status as percentage first
CharSequence status = getText(R.string.crypt_keeper_setup_description);
int percent = 0;
try { try {
// Force a 50% progress state when debugging the view. // Force a 50% progress state when debugging the view.
progress = isDebugView() ? 50 : Integer.parseInt(state); percent = isDebugView() ? 50 : Integer.parseInt(state);
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, "Error parsing progress: " + e.toString()); Log.w(TAG, "Error parsing progress: " + e.toString());
} }
String progress = Integer.toString(percent);
final CharSequence status = getText(R.string.crypt_keeper_setup_description); // Now try to get status as time remaining and replace as appropriate
Log.v(TAG, "Encryption progress: " + progress); Log.v(TAG, "Encryption progress: " + progress);
try {
final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");
int time = Integer.parseInt(timeProperty);
if (time >= 0) {
// Round up to multiple of 10 - this way display is less jerky
time = (time + 9) / 10 * 10;
progress = DateUtils.formatElapsedTime(time);
status = getText(R.string.crypt_keeper_setup_time_remaining);
}
} catch (Exception e) {
// Will happen if no time etc - show percentage
}
final TextView tv = (TextView) findViewById(R.id.status); final TextView tv = (TextView) findViewById(R.id.status);
if (tv != null) { if (tv != null) {
tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress))); tv.setText(TextUtils.expandTemplate(status, progress));
} }
// Check the progress every 5 seconds
// Check the progress every 1 seconds
mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS); mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 5000); mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 1000);
} }
/** Disable password input for a while to force the user to waste time between retries */ /** Disable password input for a while to force the user to waste time between retries */