merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/res/images/icon_error.png b/res/images/icon_error.png
index 7000d4d..cb3d1ab 100644
--- a/res/images/icon_error.png
+++ b/res/images/icon_error.png
Binary files differ
diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png
index ad79277..571eb8b 100644
--- a/res/images/icon_installing.png
+++ b/res/images/icon_installing.png
Binary files differ
diff --git a/res/images/icon_installing_overlay01.png b/res/images/icon_installing_overlay01.png
index c9f6125..e762d6c 100644
--- a/res/images/icon_installing_overlay01.png
+++ b/res/images/icon_installing_overlay01.png
Binary files differ
diff --git a/res/images/icon_installing_overlay02.png b/res/images/icon_installing_overlay02.png
index c87e5fa..f7a8530 100644
--- a/res/images/icon_installing_overlay02.png
+++ b/res/images/icon_installing_overlay02.png
Binary files differ
diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png
index 30e9580..1a1d738 100644
--- a/res/images/icon_installing_overlay03.png
+++ b/res/images/icon_installing_overlay03.png
Binary files differ
diff --git a/res/images/icon_installing_overlay04.png b/res/images/icon_installing_overlay04.png
index 6f1f9cf..a74903d 100644
--- a/res/images/icon_installing_overlay04.png
+++ b/res/images/icon_installing_overlay04.png
Binary files differ
diff --git a/res/images/icon_installing_overlay05.png b/res/images/icon_installing_overlay05.png
index 8791abd..d17bdc0 100644
--- a/res/images/icon_installing_overlay05.png
+++ b/res/images/icon_installing_overlay05.png
Binary files differ
diff --git a/res/images/icon_installing_overlay06.png b/res/images/icon_installing_overlay06.png
index 08a0133..1200b75 100644
--- a/res/images/icon_installing_overlay06.png
+++ b/res/images/icon_installing_overlay06.png
Binary files differ
diff --git a/res/images/icon_installing_overlay07.png b/res/images/icon_installing_overlay07.png
index 15b53d9..3838a85 100644
--- a/res/images/icon_installing_overlay07.png
+++ b/res/images/icon_installing_overlay07.png
Binary files differ
diff --git a/res/images/icon_installing_overlay08.png b/res/images/icon_installing_overlay08.png
deleted file mode 100644
index bb49878..0000000
--- a/res/images/icon_installing_overlay08.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay09.png b/res/images/icon_installing_overlay09.png
deleted file mode 100644
index e8715fc..0000000
--- a/res/images/icon_installing_overlay09.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay10.png b/res/images/icon_installing_overlay10.png
deleted file mode 100644
index 4ad81bf..0000000
--- a/res/images/icon_installing_overlay10.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay11.png b/res/images/icon_installing_overlay11.png
deleted file mode 100644
index b3ae7e3..0000000
--- a/res/images/icon_installing_overlay11.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay12.png b/res/images/icon_installing_overlay12.png
deleted file mode 100644
index 5e7fd04..0000000
--- a/res/images/icon_installing_overlay12.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay13.png b/res/images/icon_installing_overlay13.png
deleted file mode 100644
index 4e4dbe9..0000000
--- a/res/images/icon_installing_overlay13.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay14.png b/res/images/icon_installing_overlay14.png
deleted file mode 100644
index 55e19b5..0000000
--- a/res/images/icon_installing_overlay14.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay15.png b/res/images/icon_installing_overlay15.png
deleted file mode 100644
index ac5fb99..0000000
--- a/res/images/icon_installing_overlay15.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay16.png b/res/images/icon_installing_overlay16.png
deleted file mode 100644
index 6461d70..0000000
--- a/res/images/icon_installing_overlay16.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay17.png b/res/images/icon_installing_overlay17.png
deleted file mode 100644
index cc981d3..0000000
--- a/res/images/icon_installing_overlay17.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay18.png b/res/images/icon_installing_overlay18.png
deleted file mode 100644
index 2b32214..0000000
--- a/res/images/icon_installing_overlay18.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay19.png b/res/images/icon_installing_overlay19.png
deleted file mode 100644
index d379e51..0000000
--- a/res/images/icon_installing_overlay19.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay20.png b/res/images/icon_installing_overlay20.png
deleted file mode 100644
index 362a8ca..0000000
--- a/res/images/icon_installing_overlay20.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay21.png b/res/images/icon_installing_overlay21.png
deleted file mode 100644
index 0b65592..0000000
--- a/res/images/icon_installing_overlay21.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay22.png b/res/images/icon_installing_overlay22.png
deleted file mode 100644
index 51d5cba..0000000
--- a/res/images/icon_installing_overlay22.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay23.png b/res/images/icon_installing_overlay23.png
deleted file mode 100644
index 59148e5..0000000
--- a/res/images/icon_installing_overlay23.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay24.png b/res/images/icon_installing_overlay24.png
deleted file mode 100644
index d315673..0000000
--- a/res/images/icon_installing_overlay24.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay25.png b/res/images/icon_installing_overlay25.png
deleted file mode 100644
index 1eb7843..0000000
--- a/res/images/icon_installing_overlay25.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay26.png b/res/images/icon_installing_overlay26.png
deleted file mode 100644
index 14a024d..0000000
--- a/res/images/icon_installing_overlay26.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay27.png b/res/images/icon_installing_overlay27.png
deleted file mode 100644
index 035c163..0000000
--- a/res/images/icon_installing_overlay27.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay28.png b/res/images/icon_installing_overlay28.png
deleted file mode 100644
index 7548386..0000000
--- a/res/images/icon_installing_overlay28.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay29.png b/res/images/icon_installing_overlay29.png
deleted file mode 100644
index 836d313..0000000
--- a/res/images/icon_installing_overlay29.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay30.png b/res/images/icon_installing_overlay30.png
deleted file mode 100644
index e470a7e..0000000
--- a/res/images/icon_installing_overlay30.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay31.png b/res/images/icon_installing_overlay31.png
deleted file mode 100644
index bed0c65..0000000
--- a/res/images/icon_installing_overlay31.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay32.png b/res/images/icon_installing_overlay32.png
deleted file mode 100644
index 51811e0..0000000
--- a/res/images/icon_installing_overlay32.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay33.png b/res/images/icon_installing_overlay33.png
deleted file mode 100644
index f1fc656..0000000
--- a/res/images/icon_installing_overlay33.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay34.png b/res/images/icon_installing_overlay34.png
deleted file mode 100644
index 5791a7d..0000000
--- a/res/images/icon_installing_overlay34.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay35.png b/res/images/icon_installing_overlay35.png
deleted file mode 100644
index 0769ec9..0000000
--- a/res/images/icon_installing_overlay35.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay36.png b/res/images/icon_installing_overlay36.png
deleted file mode 100644
index 28a692b..0000000
--- a/res/images/icon_installing_overlay36.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay37.png b/res/images/icon_installing_overlay37.png
deleted file mode 100644
index 12b21cf..0000000
--- a/res/images/icon_installing_overlay37.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay38.png b/res/images/icon_installing_overlay38.png
deleted file mode 100644
index f8ef996..0000000
--- a/res/images/icon_installing_overlay38.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay39.png b/res/images/icon_installing_overlay39.png
deleted file mode 100644
index f929119..0000000
--- a/res/images/icon_installing_overlay39.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay40.png b/res/images/icon_installing_overlay40.png
deleted file mode 100644
index ceed457..0000000
--- a/res/images/icon_installing_overlay40.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay41.png b/res/images/icon_installing_overlay41.png
deleted file mode 100644
index 34cf1ae..0000000
--- a/res/images/icon_installing_overlay41.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay42.png b/res/images/icon_installing_overlay42.png
deleted file mode 100644
index d622417..0000000
--- a/res/images/icon_installing_overlay42.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay43.png b/res/images/icon_installing_overlay43.png
deleted file mode 100644
index 9902df1..0000000
--- a/res/images/icon_installing_overlay43.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay44.png b/res/images/icon_installing_overlay44.png
deleted file mode 100644
index b5d7911..0000000
--- a/res/images/icon_installing_overlay44.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay45.png b/res/images/icon_installing_overlay45.png
deleted file mode 100644
index dfbf408..0000000
--- a/res/images/icon_installing_overlay45.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay46.png b/res/images/icon_installing_overlay46.png
deleted file mode 100644
index 495bb90..0000000
--- a/res/images/icon_installing_overlay46.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay47.png b/res/images/icon_installing_overlay47.png
deleted file mode 100644
index 9d69378..0000000
--- a/res/images/icon_installing_overlay47.png
+++ /dev/null
Binary files differ
diff --git a/res/images/icon_installing_overlay48.png b/res/images/icon_installing_overlay48.png
deleted file mode 100644
index a5080af..0000000
--- a/res/images/icon_installing_overlay48.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate01.png b/res/images/indeterminate01.png
index 4db3843..933528d 100644
--- a/res/images/indeterminate01.png
+++ b/res/images/indeterminate01.png
Binary files differ
diff --git a/res/images/indeterminate02.png b/res/images/indeterminate02.png
index 761b233..d760e2b 100644
--- a/res/images/indeterminate02.png
+++ b/res/images/indeterminate02.png
Binary files differ
diff --git a/res/images/indeterminate03.png b/res/images/indeterminate03.png
index e2617ab..0e97399 100644
--- a/res/images/indeterminate03.png
+++ b/res/images/indeterminate03.png
Binary files differ
diff --git a/res/images/indeterminate04.png b/res/images/indeterminate04.png
index 132940e..c7d5b4e 100644
--- a/res/images/indeterminate04.png
+++ b/res/images/indeterminate04.png
Binary files differ
diff --git a/res/images/indeterminate05.png b/res/images/indeterminate05.png
index a17032c..d6fb2a0 100644
--- a/res/images/indeterminate05.png
+++ b/res/images/indeterminate05.png
Binary files differ
diff --git a/res/images/indeterminate06.png b/res/images/indeterminate06.png
index efaac42..4486761 100644
--- a/res/images/indeterminate06.png
+++ b/res/images/indeterminate06.png
Binary files differ
diff --git a/res/images/indeterminate07.png b/res/images/indeterminate07.png
deleted file mode 100644
index 6e84a5a..0000000
--- a/res/images/indeterminate07.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate08.png b/res/images/indeterminate08.png
deleted file mode 100644
index 58c112e..0000000
--- a/res/images/indeterminate08.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate09.png b/res/images/indeterminate09.png
deleted file mode 100644
index b25145f..0000000
--- a/res/images/indeterminate09.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate10.png b/res/images/indeterminate10.png
deleted file mode 100644
index 4ff7e25..0000000
--- a/res/images/indeterminate10.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate11.png b/res/images/indeterminate11.png
deleted file mode 100644
index 4860c2a..0000000
--- a/res/images/indeterminate11.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate12.png b/res/images/indeterminate12.png
deleted file mode 100644
index a249c22..0000000
--- a/res/images/indeterminate12.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate13.png b/res/images/indeterminate13.png
deleted file mode 100644
index 1b70dc0..0000000
--- a/res/images/indeterminate13.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate14.png b/res/images/indeterminate14.png
deleted file mode 100644
index a5f779f..0000000
--- a/res/images/indeterminate14.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate15.png b/res/images/indeterminate15.png
deleted file mode 100644
index 018fa68..0000000
--- a/res/images/indeterminate15.png
+++ /dev/null
Binary files differ
diff --git a/res/images/indeterminate16.png b/res/images/indeterminate16.png
deleted file mode 100644
index e8e05b6..0000000
--- a/res/images/indeterminate16.png
+++ /dev/null
Binary files differ
diff --git a/screen_ui.cpp b/screen_ui.cpp
index ab7546d..e36fa3d 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -76,10 +76,10 @@
// that overrides Init() to set these values appropriately and
// then call the superclass Init().
animation_fps(20),
- indeterminate_frames(16),
- installing_frames(48),
- install_overlay_offset_x(65),
- install_overlay_offset_y(106),
+ indeterminate_frames(6),
+ installing_frames(7),
+ install_overlay_offset_x(13),
+ install_overlay_offset_y(190),
overlay_offset_x(-1),
overlay_offset_y(-1) {
pthread_mutex_init(&updateMutex, NULL);
