Merge "partition: add squashfs support" into android-9.0
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 39f626f..f1bd647 100644
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -430,6 +430,11 @@
<action function="key">back</action>
</button>
+ <fill color="%background_color%">
+ <condition var1="tw_busy" var2="1"/>
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+ </fill>
+
<action>
<touch key="power"/>
<action function="togglebacklight"/>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index cde1a5b..cf30d89 100644
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -430,6 +430,11 @@
<action function="key">back</action>
</button>
+ <fill color="%background_color%">
+ <condition var1="tw_busy" var2="1"/>
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+ </fill>
+
<action>
<touch key="power"/>
<action function="togglebacklight"/>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index 0545b3f..3f3102a 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -334,6 +334,11 @@
<action function="key">back</action>
</button>
+ <fill color="%background_color%">
+ <condition var1="tw_busy" var2="1"/>
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+ </fill>
+
<action>
<touch key="power"/>
<action function="togglebacklight"/>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 061d46b..f41ff79 100644
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -334,6 +334,11 @@
<action function="key">back</action>
</button>
+ <fill color="%background_color%">
+ <condition var1="tw_busy" var2="1"/>
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+ </fill>
+
<action>
<touch key="power"/>
<action function="togglebacklight"/>
diff --git a/minuitwrp/graphics_overlay.cpp b/minuitwrp/graphics_overlay.cpp
index e4fc419..b4efae4 100644
--- a/minuitwrp/graphics_overlay.cpp
+++ b/minuitwrp/graphics_overlay.cpp
@@ -50,7 +50,6 @@
static GRSurface gr_framebuffer;
static GRSurface* gr_draw = NULL;
-static int displayed_buffer;
static fb_var_screeninfo vi;
static int fb_fd = -1;
@@ -100,7 +99,6 @@
bool target_has_overlay(char *version)
{
- int ret;
int mdp_version;
bool overlay_supported = false;