Removed extra reboot step

openandroidinstaller-dev · Mar 24, 2023 · b12f239 · b12f239
1 parent faf315f
commit b12f239
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 80 deletions.
diff --git a/openandroidinstaller/assets/configs/avicii.yaml b/openandroidinstaller/assets/configs/avicii.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/cheeseburger.yaml b/openandroidinstaller/assets/configs/cheeseburger.yaml
@@ -15,15 +15,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/dre.yaml b/openandroidinstaller/assets/configs/dre.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/dumpling.yaml b/openandroidinstaller/assets/configs/dumpling.yaml
@@ -15,15 +15,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/enchilada.yaml b/openandroidinstaller/assets/configs/enchilada.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/fajita.yaml b/openandroidinstaller/assets/configs/fajita.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/guacamole.yaml b/openandroidinstaller/assets/configs/guacamole.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/guacamoleb.yaml b/openandroidinstaller/assets/configs/guacamoleb.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/hotdog.yaml b/openandroidinstaller/assets/configs/hotdog.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:

diff --git a/openandroidinstaller/assets/configs/hotdogb.yaml b/openandroidinstaller/assets/configs/hotdogb.yaml
@@ -16,15 +16,10 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery: