Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a697feb authored by Alain Vongsouvanh's avatar Alain Vongsouvanh Committed by android-build-merger
Browse files

resolve merge conflicts of 6aa6ddb3 to nyc-dev 

am: 771b6eb8

Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903
parents 64f46fb1 771b6eb8

wear_ui.cpp

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() { 
        if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)

                                                            && !show_text) {

            if (!intro_done) {

                if (current_frame == intro_frames - 1) {

                if (current_frame >= intro_frames - 1) {

                    intro_done = true;

                    current_frame = 0;

                } else {