From 02f52108d9d4b9ff0dfe35322568970c20de8d3c Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Thu, 30 Nov 2017 23:40:59 +0100
Subject: [PATCH] Show progress when installing AB updates

Change-Id: If8cd2e2da1f15a4af415aa35ccf61052c318333f
---
 src/org/lineageos/updater/UpdatesListAdapter.java        | 7 +++++--
 src/org/lineageos/updater/controller/UpdaterService.java | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 39a6c598..38669726 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -159,7 +159,10 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         } else if (mUpdaterController.isInstallingUpdate(downloadId)) {
             setButtonAction(viewHolder.mAction, Action.INSTALL, downloadId, false);
             viewHolder.mProgressText.setText(R.string.list_installing_update);
-            viewHolder.mProgressBar.setIndeterminate(true);
+            viewHolder.mProgressBar.setProgress(update.getInstallProgress());
+            String percentage = NumberFormat.getPercentInstance().format(
+                    update.getInstallProgress() / 100.f);
+            viewHolder.mProgressPercentage.setText(percentage);
         } else if (mUpdaterController.isVerifyingUpdate(downloadId)) {
             setButtonAction(viewHolder.mAction, Action.INSTALL, downloadId, false);
             viewHolder.mProgressText.setText(R.string.list_verifying_update);
@@ -226,7 +229,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 activeLayout = update.getStatus() == UpdateStatus.STARTING;
                 break;
             case UpdateStatus.Persistent.VERIFIED:
-                activeLayout = false;
+                activeLayout = update.getStatus() == UpdateStatus.INSTALLING;
                 break;
             case UpdateStatus.Persistent.INCOMPLETE:
                 activeLayout = true;
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 36421c3b..317e1853 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -332,7 +332,7 @@ public class UpdaterService extends Service {
             }
             case INSTALLING: {
                 mNotificationBuilder.mActions.clear();
-                mNotificationBuilder.setProgress(0, 0, true);
+                mNotificationBuilder.setProgress(0, 0, false);
                 mNotificationStyle.setSummaryText(null);
                 String text = getString(R.string.installing_update);
                 mNotificationStyle.bigText(text);