diff options
| author | Tao Bao <tbao@google.com> | 2017-03-07 21:09:09 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-07 21:09:09 +0100 |
| commit | f8fddd0341f53342ef967969e196a6131b48d9e4 (patch) | |
| tree | 2ad68ed606a5f43cd802c8a388793ebf858c67c3 | |
| parent | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c (diff) | |
| parent | Merge "recovery: Add SetStage() into 'Run graphics test'." (diff) | |
| download | android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar.gz android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar.bz2 android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar.lz android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar.xz android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.tar.zst android_bootable_recovery-f8fddd0341f53342ef967969e196a6131b48d9e4.zip | |
| -rw-r--r-- | recovery.cpp | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/recovery.cpp b/recovery.cpp index 223ca94d0..61d3bf4f7 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -969,35 +969,47 @@ static void choose_recovery_file(Device* device) { } } -static void run_graphics_test(Device* device) { - // Switch to graphics screen. - ui->ShowText(false); +static void run_graphics_test() { + // Switch to graphics screen. + ui->ShowText(false); - ui->SetProgressType(RecoveryUI::INDETERMINATE); - ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); - sleep(1); - - ui->SetBackground(RecoveryUI::ERROR); - sleep(1); - - ui->SetBackground(RecoveryUI::NO_COMMAND); - sleep(1); + ui->SetProgressType(RecoveryUI::INDETERMINATE); + ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + sleep(1); - ui->SetBackground(RecoveryUI::ERASING); - sleep(1); + ui->SetBackground(RecoveryUI::ERROR); + sleep(1); - ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + ui->SetBackground(RecoveryUI::NO_COMMAND); + sleep(1); - ui->SetProgressType(RecoveryUI::DETERMINATE); - ui->ShowProgress(1.0, 10.0); - float fraction = 0.0; - for (size_t i = 0; i < 100; ++i) { - fraction += .01; - ui->SetProgress(fraction); - usleep(100000); - } + ui->SetBackground(RecoveryUI::ERASING); + sleep(1); + + // Calling SetBackground() after SetStage() to trigger a redraw. + ui->SetStage(1, 3); + ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + sleep(1); + ui->SetStage(2, 3); + ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + sleep(1); + ui->SetStage(3, 3); + ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + sleep(1); + + ui->SetStage(-1, -1); + ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); + + ui->SetProgressType(RecoveryUI::DETERMINATE); + ui->ShowProgress(1.0, 10.0); + float fraction = 0.0; + for (size_t i = 0; i < 100; ++i) { + fraction += .01; + ui->SetProgress(fraction); + usleep(100000); + } - ui->ShowText(true); + ui->ShowText(true); } // How long (in seconds) we wait for the fuse-provided package file to @@ -1165,7 +1177,7 @@ prompt_and_wait(Device* device, int status) { break; case Device::RUN_GRAPHICS_TEST: - run_graphics_test(device); + run_graphics_test(); break; case Device::MOUNT_SYSTEM: |