486 files changed, 92 insertions, 29 deletions

diff --git a/interlace-frames.py b/interlace-frames.py
index 3e777b470..6b435aa90 100644..100755
--- a/interlace-frames.py
+++ b/interlace-frames.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright (C) 2014 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,19 +14,16 @@
 # limitations under the License.
 
 """
-Script to take a set of frames (PNG files) for a recovery animation and turn
-it into a single output image which contains the input frames interlaced by
-row. Run with the names of all the input frames on the command line. Specify
-the name of the output file with -o (or --output), and optionally specify the
-number of frames per second (FPS) with --fps (default: 20).
-
-e.g.
-interlace-frames.py --fps 20 --output output.png frame0.png frame1.png frame3.png
+Script to take a set of frames (PNG files) for a recovery animation
+and turn it into a single output image which contains the input frames
+interlaced by row.  Run with the names of all the input frames on the
+command line, in order, followed by the name of the output file.
 """
 
 from __future__ import print_function
 
 import argparse
+import os.path
 import sys
 try:
   import Image
@@ -35,7 +33,7 @@ except ImportError:
   sys.exit(1)
 
 
-def interlace(output, fps, inputs):
+def interlace(output, inputs):
   frames = [Image.open(fn).convert("RGB") for fn in inputs]
   assert len(frames) > 0, "Must have at least one input frame."
   sizes = set()
@@ -60,21 +58,57 @@ def interlace(output, fps, inputs):
 
   meta = PngImagePlugin.PngInfo()
   meta.add_text("Frames", str(N))
-  meta.add_text("FPS", str(fps))
 
   out.save(output, pnginfo=meta)
 
 
+def deinterlace(output, input):
+  # Truncate the output filename extension if it's '.png'.
+  if os.path.splitext(output)[1].lower() == '.png':
+    output = output[:-4]
+
+  img2 = Image.open(input)
+  print(img2.mode)
+  palette = img2.getpalette()
+  img = img2.convert("RGB")
+  num_frames = int(img.info.get('Frames', 1))
+  print('Found %d frames in %s.' % (num_frames, input))
+  assert num_frames > 0, 'Invalid Frames meta.'
+
+  # palette = img.getpalette()
+  print(palette)
+
+  width, height = img.size
+  height /= num_frames
+  for k in range(num_frames):
+    out = Image.new('RGB', (width, height))
+    out.info = img.info
+    for i in range(width):
+      for j in range(height):
+        out.putpixel((i, j), img.getpixel((i, j * num_frames + k)))
+    # out.putpalette(img.getpalette(), rawmode='RGB')
+    out2 = out.convert(mode='P', palette=palette)
+    #out2 = out
+    print(out2.mode)
+    # out2.putpalette(palette)
+    filename = '%s%02d.png' % (output, k)
+    out2.save(filename)
+    print('Frame %d written to %s.' % (k, filename))
+
+
 def main(argv):
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--fps', default=20)
+  parser = argparse.ArgumentParser(description='Parse')
+  parser.add_argument('--deinterlace', '-d', action='store_true')
   parser.add_argument('--output', '-o', required=True)
   parser.add_argument('input', nargs='+')
   args = parser.parse_args(argv)
 
-  interlace(args.output, args.fps, args.input)
+  if args.deinterlace:
+    # args.input is a list, and we only process the first when deinterlacing.
+    deinterlace(args.output, args.input[0])
+  else:
+    interlace(args.output, args.input)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])
-
diff --git a/minui/minui.h b/minui/minui.h
index e3bc00548..fb0bbe10c 100644
--- a/minui/minui.h
+++ b/minui/minui.h
@@ -84,6 +84,8 @@ int ev_get_epollfd();
 // Resources
 //
 
+bool matches_locale(const char* prefix, const char* locale);
+
 // res_create_*_surface() functions return 0 if no error, else
 // negative.
 //
diff --git a/minui/resources.cpp b/minui/resources.cpp
index 5d69ea2d0..40d3c2c88 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -370,21 +370,16 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
     return result;
 }
 
-static int matches_locale(const char* loc, const char* locale) {
-    if (locale == NULL) return 0;
+// This function tests if a locale string stored in PNG (prefix) matches
+// the locale string provided by the system (locale).
+bool matches_locale(const char* prefix, const char* locale) {
+    if (locale == NULL) return false;
 
-    if (strcmp(loc, locale) == 0) return 1;
+    // Return true if the whole string of prefix matches the top part of
+    // locale. For instance, prefix == "en" matches locale == "en_US";
+    // and prefix == "zh_CN" matches locale == "zh_CN_#Hans".
 
-    // if loc does *not* have an underscore, and it matches the start
-    // of locale, and the next character in locale *is* an underscore,
-    // that's a match.  For instance, loc == "en" matches locale ==
-    // "en_US".
-
-    int i;
-    for (i = 0; loc[i] != 0 && loc[i] != '_'; ++i);
-    if (loc[i] == '_') return 0;
-
-    return (strncmp(locale, loc, i) == 0 && locale[i] == '_');
+    return (strncmp(prefix, locale, strlen(prefix)) == 0);
 }
 
 int res_create_localized_alpha_surface(const char* name,
diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png
index 774244c84..d3c90db82 100644
--- a/res-hdpi/images/erasing_text.png
+++ b/res-hdpi/images/erasing_text.png
diff --git a/res-hdpi/images/error_text.png b/res-hdpi/images/error_text.png
index 64a57ec4e..4349899fb 100644
--- a/res-hdpi/images/error_text.png
+++ b/res-hdpi/images/error_text.png
diff --git a/res-hdpi/images/installing_security_text.png b/res-hdpi/images/installing_security_text.png
new file mode 100644
index 000000000..2921849d1
--- /dev/null
+++ b/res-hdpi/images/installing_security_text.png
diff --git a/res-hdpi/images/installing_text.png b/res-hdpi/images/installing_text.png
index 33b54f1bf..d0624952e 100644
--- a/res-hdpi/images/installing_text.png
+++ b/res-hdpi/images/installing_text.png
diff --git a/res-hdpi/images/loop00.png b/res-hdpi/images/loop00.png
index c7f8084b8..d360c79c5 100644
--- a/res-hdpi/images/loop00.png
+++ b/res-hdpi/images/loop00.png
diff --git a/res-hdpi/images/loop01.png b/res-hdpi/images/loop01.png
index 31ed66703..a0b7ac665 100644
--- a/res-hdpi/images/loop01.png
+++ b/res-hdpi/images/loop01.png
diff --git a/res-hdpi/images/loop02.png b/res-hdpi/images/loop02.png
index 114340722..739c5805a 100644
--- a/res-hdpi/images/loop02.png
+++ b/res-hdpi/images/loop02.png
diff --git a/res-hdpi/images/loop03.png b/res-hdpi/images/loop03.png
index 040eeb293..98a4890ad 100644
--- a/res-hdpi/images/loop03.png
+++ b/res-hdpi/images/loop03.png
diff --git a/res-hdpi/images/loop04.png b/res-hdpi/images/loop04.png
index 58e139de3..df6a09e34 100644
--- a/res-hdpi/images/loop04.png
+++ b/res-hdpi/images/loop04.png
diff --git a/res-hdpi/images/loop05.png b/res-hdpi/images/loop05.png
index f0c250098..4d8d56de4 100644
--- a/res-hdpi/images/loop05.png
+++ b/res-hdpi/images/loop05.png
diff --git a/res-hdpi/images/loop06.png b/res-hdpi/images/loop06.png
index e8c5b218c..c5f26f108 100644
--- a/res-hdpi/images/loop06.png
+++ b/res-hdpi/images/loop06.png
diff --git a/res-hdpi/images/loop07.png b/res-hdpi/images/loop07.png
deleted file mode 100644
index ee0523fbc..000000000
--- a/res-hdpi/images/loop07.png
+++ /dev/null
diff --git a/res-hdpi/images/loop08.png b/res-hdpi/images/loop08.png
deleted file mode 100644
index f568a1c7d..000000000
--- a/res-hdpi/images/loop08.png
+++ /dev/null
diff --git a/res-hdpi/images/loop09.png b/res-hdpi/images/loop09.png
deleted file mode 100644
index 9fed668f8..000000000
--- a/res-hdpi/images/loop09.png
+++ /dev/null
diff --git a/res-hdpi/images/loop10.png b/res-hdpi/images/loop10.png
deleted file mode 100644
index 93edfcc30..000000000
--- a/res-hdpi/images/loop10.png
+++ /dev/null
diff --git a/res-hdpi/images/loop11.png b/res-hdpi/images/loop11.png
deleted file mode 100644
index 827fce887..000000000
--- a/res-hdpi/images/loop11.png
+++ /dev/null
diff --git a/res-hdpi/images/loop12.png b/res-hdpi/images/loop12.png
deleted file mode 100644
index 927f04e49..000000000
--- a/res-hdpi/images/loop12.png
+++ /dev/null
diff --git a/res-hdpi/images/loop13.png b/res-hdpi/images/loop13.png
deleted file mode 100644
index 2856f316e..000000000
--- a/res-hdpi/images/loop13.png
+++ /dev/null
diff --git a/res-hdpi/images/loop14.png b/res-hdpi/images/loop14.png
deleted file mode 100644
index 3a2c14dc9..000000000
--- a/res-hdpi/images/loop14.png
+++ /dev/null
diff --git a/res-hdpi/images/loop15.png b/res-hdpi/images/loop15.png
deleted file mode 100644
index dcde38335..000000000
--- a/res-hdpi/images/loop15.png
+++ /dev/null
diff --git a/res-hdpi/images/loop16.png b/res-hdpi/images/loop16.png
deleted file mode 100644
index 7ba01f3b4..000000000
--- a/res-hdpi/images/loop16.png
+++ /dev/null
diff --git a/res-hdpi/images/loop17.png b/res-hdpi/images/loop17.png
deleted file mode 100644
index 82a875f58..000000000
--- a/res-hdpi/images/loop17.png
+++ /dev/null
diff --git a/res-hdpi/images/loop18.png b/res-hdpi/images/loop18.png
deleted file mode 100644
index 00537e7fd..000000000
--- a/res-hdpi/images/loop18.png
+++ /dev/null
diff --git a/res-hdpi/images/loop19.png b/res-hdpi/images/loop19.png
deleted file mode 100644
index add89422a..000000000
--- a/res-hdpi/images/loop19.png
+++ /dev/null
diff --git a/res-hdpi/images/loop20.png b/res-hdpi/images/loop20.png
deleted file mode 100644
index 3c6f74483..000000000
--- a/res-hdpi/images/loop20.png
+++ /dev/null
diff --git a/res-hdpi/images/loop21.png b/res-hdpi/images/loop21.png
deleted file mode 100644
index e1d1adb8f..000000000
--- a/res-hdpi/images/loop21.png
+++ /dev/null
diff --git a/res-hdpi/images/loop22.png b/res-hdpi/images/loop22.png
deleted file mode 100644
index bdee1acc1..000000000
--- a/res-hdpi/images/loop22.png
+++ /dev/null
diff --git a/res-hdpi/images/loop23.png b/res-hdpi/images/loop23.png
deleted file mode 100644
index 631c62d00..000000000
--- a/res-hdpi/images/loop23.png
+++ /dev/null
diff --git a/res-hdpi/images/loop24.png b/res-hdpi/images/loop24.png
deleted file mode 100644
index 081ba89b6..000000000
--- a/res-hdpi/images/loop24.png
+++ /dev/null
diff --git a/res-hdpi/images/loop25.png b/res-hdpi/images/loop25.png
deleted file mode 100644
index 7511fc0be..000000000
--- a/res-hdpi/images/loop25.png
+++ /dev/null
diff --git a/res-hdpi/images/loop26.png b/res-hdpi/images/loop26.png
deleted file mode 100644
index d9ae7d303..000000000
--- a/res-hdpi/images/loop26.png
+++ /dev/null
diff --git a/res-hdpi/images/loop27.png b/res-hdpi/images/loop27.png
deleted file mode 100644
index ca1d45e21..000000000
--- a/res-hdpi/images/loop27.png
+++ /dev/null
diff --git a/res-hdpi/images/loop28.png b/res-hdpi/images/loop28.png
deleted file mode 100644
index 404297482..000000000
--- a/res-hdpi/images/loop28.png
+++ /dev/null
diff --git a/res-hdpi/images/loop29.png b/res-hdpi/images/loop29.png
deleted file mode 100644
index 506e9e486..000000000
--- a/res-hdpi/images/loop29.png
+++ /dev/null
diff --git a/res-hdpi/images/loop30.png b/res-hdpi/images/loop30.png
deleted file mode 100644
index 4f985058f..000000000
--- a/res-hdpi/images/loop30.png
+++ /dev/null
diff --git a/res-hdpi/images/loop31.png b/res-hdpi/images/loop31.png
deleted file mode 100644
index b259b47f9..000000000
--- a/res-hdpi/images/loop31.png
+++ /dev/null
diff --git a/res-hdpi/images/loop32.png b/res-hdpi/images/loop32.png
deleted file mode 100644
index 3ddfab8ad..000000000
--- a/res-hdpi/images/loop32.png
+++ /dev/null
diff --git a/res-hdpi/images/loop33.png b/res-hdpi/images/loop33.png
deleted file mode 100644
index b61b64b16..000000000
--- a/res-hdpi/images/loop33.png
+++ /dev/null
diff --git a/res-hdpi/images/loop34.png b/res-hdpi/images/loop34.png
deleted file mode 100644
index 96e839216..000000000
--- a/res-hdpi/images/loop34.png
+++ /dev/null
diff --git a/res-hdpi/images/loop35.png b/res-hdpi/images/loop35.png
deleted file mode 100644
index a8bb7fc27..000000000
--- a/res-hdpi/images/loop35.png
+++ /dev/null
diff --git a/res-hdpi/images/loop36.png b/res-hdpi/images/loop36.png
deleted file mode 100644
index 5171a3b0f..000000000
--- a/res-hdpi/images/loop36.png
+++ /dev/null
diff --git a/res-hdpi/images/loop37.png b/res-hdpi/images/loop37.png
deleted file mode 100644
index b4ba0a6dc..000000000
--- a/res-hdpi/images/loop37.png
+++ /dev/null
diff --git a/res-hdpi/images/loop38.png b/res-hdpi/images/loop38.png
deleted file mode 100644
index bd248d816..000000000
--- a/res-hdpi/images/loop38.png
+++ /dev/null
diff --git a/res-hdpi/images/loop39.png b/res-hdpi/images/loop39.png
deleted file mode 100644
index 40e2eee0f..000000000
--- a/res-hdpi/images/loop39.png
+++ /dev/null
diff --git a/res-hdpi/images/loop40.png b/res-hdpi/images/loop40.png
deleted file mode 100644
index 4ffadc69f..000000000
--- a/res-hdpi/images/loop40.png
+++ /dev/null
diff --git a/res-hdpi/images/loop41.png b/res-hdpi/images/loop41.png
deleted file mode 100644
index e0f107bfb..000000000
--- a/res-hdpi/images/loop41.png
+++ /dev/null
diff --git a/res-hdpi/images/loop42.png b/res-hdpi/images/loop42.png
deleted file mode 100644
index 04b618aee..000000000
--- a/res-hdpi/images/loop42.png
+++ /dev/null
diff --git a/res-hdpi/images/loop43.png b/res-hdpi/images/loop43.png
deleted file mode 100644
index e344cb90e..000000000
--- a/res-hdpi/images/loop43.png
+++ /dev/null
diff --git a/res-hdpi/images/loop44.png b/res-hdpi/images/loop44.png
deleted file mode 100644
index 85acfa053..000000000
--- a/res-hdpi/images/loop44.png
+++ /dev/null
diff --git a/res-hdpi/images/loop45.png b/res-hdpi/images/loop45.png
deleted file mode 100644
index d1f90b313..000000000
--- a/res-hdpi/images/loop45.png
+++ /dev/null
diff --git a/res-hdpi/images/loop46.png b/res-hdpi/images/loop46.png
deleted file mode 100644
index 386a682d9..000000000
--- a/res-hdpi/images/loop46.png
+++ /dev/null
diff --git a/res-hdpi/images/loop47.png b/res-hdpi/images/loop47.png
deleted file mode 100644
index fa87591ce..000000000
--- a/res-hdpi/images/loop47.png
+++ /dev/null
diff --git a/res-hdpi/images/loop48.png b/res-hdpi/images/loop48.png
deleted file mode 100644
index fec1c9d6e..000000000
--- a/res-hdpi/images/loop48.png
+++ /dev/null
diff --git a/res-hdpi/images/loop49.png b/res-hdpi/images/loop49.png
deleted file mode 100644
index fbe504d6b..000000000
--- a/res-hdpi/images/loop49.png
+++ /dev/null
diff --git a/res-hdpi/images/loop50.png b/res-hdpi/images/loop50.png
deleted file mode 100644
index 62ea7205f..000000000
--- a/res-hdpi/images/loop50.png
+++ /dev/null
diff --git a/res-hdpi/images/loop51.png b/res-hdpi/images/loop51.png
deleted file mode 100644
index 6b1b5c193..000000000
--- a/res-hdpi/images/loop51.png
+++ /dev/null
diff --git a/res-hdpi/images/loop52.png b/res-hdpi/images/loop52.png
deleted file mode 100644
index 48c2137c9..000000000
--- a/res-hdpi/images/loop52.png
+++ /dev/null
diff --git a/res-hdpi/images/loop53.png b/res-hdpi/images/loop53.png
deleted file mode 100644
index 680945803..000000000
--- a/res-hdpi/images/loop53.png
+++ /dev/null
diff --git a/res-hdpi/images/loop54.png b/res-hdpi/images/loop54.png
deleted file mode 100644
index fb94ad815..000000000
--- a/res-hdpi/images/loop54.png
+++ /dev/null
diff --git a/res-hdpi/images/loop55.png b/res-hdpi/images/loop55.png
deleted file mode 100644
index c7f209245..000000000
--- a/res-hdpi/images/loop55.png
+++ /dev/null
diff --git a/res-hdpi/images/loop56.png b/res-hdpi/images/loop56.png
deleted file mode 100644
index aa376ccd0..000000000
--- a/res-hdpi/images/loop56.png
+++ /dev/null
diff --git a/res-hdpi/images/loop57.png b/res-hdpi/images/loop57.png
deleted file mode 100644
index b2bf5d8ff..000000000
--- a/res-hdpi/images/loop57.png
+++ /dev/null
diff --git a/res-hdpi/images/loop58.png b/res-hdpi/images/loop58.png
deleted file mode 100644
index acef9338d..000000000
--- a/res-hdpi/images/loop58.png
+++ /dev/null
diff --git a/res-hdpi/images/loop59.png b/res-hdpi/images/loop59.png
deleted file mode 100644
index f0d191e68..000000000
--- a/res-hdpi/images/loop59.png
+++ /dev/null
diff --git a/res-hdpi/images/loop60.png b/res-hdpi/images/loop60.png
deleted file mode 100644
index d58edc606..000000000
--- a/res-hdpi/images/loop60.png
+++ /dev/null
diff --git a/res-hdpi/images/loop61.png b/res-hdpi/images/loop61.png
deleted file mode 100644
index d355a188d..000000000
--- a/res-hdpi/images/loop61.png
+++ /dev/null
diff --git a/res-hdpi/images/loop62.png b/res-hdpi/images/loop62.png
deleted file mode 100644
index 95fd66f1b..000000000
--- a/res-hdpi/images/loop62.png
+++ /dev/null
diff --git a/res-hdpi/images/loop63.png b/res-hdpi/images/loop63.png
deleted file mode 100644
index 619bbf4e4..000000000
--- a/res-hdpi/images/loop63.png
+++ /dev/null
diff --git a/res-hdpi/images/loop64.png b/res-hdpi/images/loop64.png
deleted file mode 100644
index 1867c8e7d..000000000
--- a/res-hdpi/images/loop64.png
+++ /dev/null
diff --git a/res-hdpi/images/loop65.png b/res-hdpi/images/loop65.png
deleted file mode 100644
index a0eee31b2..000000000
--- a/res-hdpi/images/loop65.png
+++ /dev/null
diff --git a/res-hdpi/images/loop66.png b/res-hdpi/images/loop66.png
deleted file mode 100644
index b6befd6bf..000000000
--- a/res-hdpi/images/loop66.png
+++ /dev/null
diff --git a/res-hdpi/images/loop67.png b/res-hdpi/images/loop67.png
deleted file mode 100644
index 25762944f..000000000
--- a/res-hdpi/images/loop67.png
+++ /dev/null
diff --git a/res-hdpi/images/loop68.png b/res-hdpi/images/loop68.png
deleted file mode 100644
index 0bc718f75..000000000
--- a/res-hdpi/images/loop68.png
+++ /dev/null
diff --git a/res-hdpi/images/loop69.png b/res-hdpi/images/loop69.png
deleted file mode 100644
index 3678cea38..000000000
--- a/res-hdpi/images/loop69.png
+++ /dev/null
diff --git a/res-hdpi/images/loop70.png b/res-hdpi/images/loop70.png
deleted file mode 100644
index 03e69c466..000000000
--- a/res-hdpi/images/loop70.png
+++ /dev/null
diff --git a/res-hdpi/images/loop71.png b/res-hdpi/images/loop71.png
deleted file mode 100644
index 62ba17e17..000000000
--- a/res-hdpi/images/loop71.png
+++ /dev/null
diff --git a/res-hdpi/images/loop72.png b/res-hdpi/images/loop72.png
deleted file mode 100644
index c6e8feede..000000000
--- a/res-hdpi/images/loop72.png
+++ /dev/null
diff --git a/res-hdpi/images/loop73.png b/res-hdpi/images/loop73.png
deleted file mode 100644
index c12fb7d34..000000000
--- a/res-hdpi/images/loop73.png
+++ /dev/null
diff --git a/res-hdpi/images/loop74.png b/res-hdpi/images/loop74.png
deleted file mode 100644
index 30b8ff951..000000000
--- a/res-hdpi/images/loop74.png
+++ /dev/null
diff --git a/res-hdpi/images/loop75.png b/res-hdpi/images/loop75.png
deleted file mode 100644
index c9b494029..000000000
--- a/res-hdpi/images/loop75.png
+++ /dev/null
diff --git a/res-hdpi/images/loop76.png b/res-hdpi/images/loop76.png
deleted file mode 100644
index 9e789a587..000000000
--- a/res-hdpi/images/loop76.png
+++ /dev/null
diff --git a/res-hdpi/images/loop77.png b/res-hdpi/images/loop77.png
deleted file mode 100644
index c235f53aa..000000000
--- a/res-hdpi/images/loop77.png
+++ /dev/null
diff --git a/res-hdpi/images/loop78.png b/res-hdpi/images/loop78.png
deleted file mode 100644
index 11aaf36e4..000000000
--- a/res-hdpi/images/loop78.png
+++ /dev/null
diff --git a/res-hdpi/images/loop79.png b/res-hdpi/images/loop79.png
deleted file mode 100644
index cce9d8ae2..000000000
--- a/res-hdpi/images/loop79.png
+++ /dev/null
diff --git a/res-hdpi/images/loop80.png b/res-hdpi/images/loop80.png
deleted file mode 100644
index e92ba6214..000000000
--- a/res-hdpi/images/loop80.png
+++ /dev/null
diff --git a/res-hdpi/images/loop81.png b/res-hdpi/images/loop81.png
deleted file mode 100644
index ae44a1cb5..000000000
--- a/res-hdpi/images/loop81.png
+++ /dev/null
diff --git a/res-hdpi/images/loop82.png b/res-hdpi/images/loop82.png
deleted file mode 100644
index 646b5e7f2..000000000
--- a/res-hdpi/images/loop82.png
+++ /dev/null
diff --git a/res-hdpi/images/loop83.png b/res-hdpi/images/loop83.png
deleted file mode 100644
index 37357b532..000000000
--- a/res-hdpi/images/loop83.png
+++ /dev/null
diff --git a/res-hdpi/images/loop84.png b/res-hdpi/images/loop84.png
deleted file mode 100644
index e52d037dc..000000000
--- a/res-hdpi/images/loop84.png
+++ /dev/null
diff --git a/res-hdpi/images/loop85.png b/res-hdpi/images/loop85.png
deleted file mode 100644
index 73ecb61cb..000000000
--- a/res-hdpi/images/loop85.png
+++ /dev/null
diff --git a/res-hdpi/images/loop86.png b/res-hdpi/images/loop86.png
deleted file mode 100644
index 9474ed5ae..000000000
--- a/res-hdpi/images/loop86.png
+++ /dev/null
diff --git a/res-hdpi/images/loop87.png b/res-hdpi/images/loop87.png
deleted file mode 100644
index af86252b1..000000000
--- a/res-hdpi/images/loop87.png
+++ /dev/null
diff --git a/res-hdpi/images/loop88.png b/res-hdpi/images/loop88.png
deleted file mode 100644
index 0b6955bd9..000000000
--- a/res-hdpi/images/loop88.png
+++ /dev/null
diff --git a/res-hdpi/images/loop89.png b/res-hdpi/images/loop89.png
deleted file mode 100644
index e52e38d85..000000000
--- a/res-hdpi/images/loop89.png
+++ /dev/null
diff --git a/res-hdpi/images/loop90.png b/res-hdpi/images/loop90.png
deleted file mode 100644
index c7f8084b8..000000000
--- a/res-hdpi/images/loop90.png
+++ /dev/null
diff --git a/res-hdpi/images/no_command_text.png b/res-hdpi/images/no_command_text.png
index 9927ecb6d..99ee08e83 100644
--- a/res-hdpi/images/no_command_text.png
+++ b/res-hdpi/images/no_command_text.png
diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png
index fd86c3f6e..d209b865f 100644
--- a/res-mdpi/images/erasing_text.png
+++ b/res-mdpi/images/erasing_text.png
diff --git a/res-mdpi/images/error_text.png b/res-mdpi/images/error_text.png
index f1b44c9b3..3357e2f2e 100644
--- a/res-mdpi/images/error_text.png
+++ b/res-mdpi/images/error_text.png
diff --git a/res-mdpi/images/installing_security_text.png b/res-mdpi/images/installing_security_text.png
new file mode 100644
index 000000000..3b1fbe038
--- /dev/null
+++ b/res-mdpi/images/installing_security_text.png
diff --git a/res-mdpi/images/installing_text.png b/res-mdpi/images/installing_text.png
index 064b2a317..a350f93a3 100644
--- a/res-mdpi/images/installing_text.png
+++ b/res-mdpi/images/installing_text.png
diff --git a/res-mdpi/images/loop00.png b/res-mdpi/images/loop00.png
index 20bebb0e0..d360c79c5 100644
--- a/res-mdpi/images/loop00.png
+++ b/res-mdpi/images/loop00.png
diff --git a/res-mdpi/images/loop01.png b/res-mdpi/images/loop01.png
index f5eabddca..a0b7ac665 100644
--- a/res-mdpi/images/loop01.png
+++ b/res-mdpi/images/loop01.png
diff --git a/res-mdpi/images/loop02.png b/res-mdpi/images/loop02.png
index ae93a51d3..739c5805a 100644
--- a/res-mdpi/images/loop02.png
+++ b/res-mdpi/images/loop02.png
diff --git a/res-mdpi/images/loop03.png b/res-mdpi/images/loop03.png
index bda711b08..98a4890ad 100644
--- a/res-mdpi/images/loop03.png
+++ b/res-mdpi/images/loop03.png
diff --git a/res-mdpi/images/loop04.png b/res-mdpi/images/loop04.png
index 8e55e969d..df6a09e34 100644
--- a/res-mdpi/images/loop04.png
+++ b/res-mdpi/images/loop04.png
diff --git a/res-mdpi/images/loop05.png b/res-mdpi/images/loop05.png
index 69d2172d5..4d8d56de4 100644
--- a/res-mdpi/images/loop05.png
+++ b/res-mdpi/images/loop05.png
diff --git a/res-mdpi/images/loop06.png b/res-mdpi/images/loop06.png
index f876787bc..c5f26f108 100644
--- a/res-mdpi/images/loop06.png
+++ b/res-mdpi/images/loop06.png
diff --git a/res-mdpi/images/loop07.png b/res-mdpi/images/loop07.png
deleted file mode 100644
index ee34a8180..000000000
--- a/res-mdpi/images/loop07.png
+++ /dev/null
diff --git a/res-mdpi/images/loop08.png b/res-mdpi/images/loop08.png
deleted file mode 100644
index 2d5c3eb3b..000000000
--- a/res-mdpi/images/loop08.png
+++ /dev/null
diff --git a/res-mdpi/images/loop09.png b/res-mdpi/images/loop09.png
deleted file mode 100644
index c83a736bf..000000000
--- a/res-mdpi/images/loop09.png
+++ /dev/null
diff --git a/res-mdpi/images/loop10.png b/res-mdpi/images/loop10.png
deleted file mode 100644
index 6cd8d8c84..000000000
--- a/res-mdpi/images/loop10.png
+++ /dev/null
diff --git a/res-mdpi/images/loop11.png b/res-mdpi/images/loop11.png
deleted file mode 100644
index c33dcb2b3..000000000
--- a/res-mdpi/images/loop11.png
+++ /dev/null
diff --git a/res-mdpi/images/loop12.png b/res-mdpi/images/loop12.png
deleted file mode 100644
index 1f2b2f4e1..000000000
--- a/res-mdpi/images/loop12.png
+++ /dev/null
diff --git a/res-mdpi/images/loop13.png b/res-mdpi/images/loop13.png
deleted file mode 100644
index 8a15029fd..000000000
--- a/res-mdpi/images/loop13.png
+++ /dev/null
diff --git a/res-mdpi/images/loop14.png b/res-mdpi/images/loop14.png
deleted file mode 100644
index 3ab2fee9d..000000000
--- a/res-mdpi/images/loop14.png
+++ /dev/null
diff --git a/res-mdpi/images/loop15.png b/res-mdpi/images/loop15.png
deleted file mode 100644
index 6af606f80..000000000
--- a/res-mdpi/images/loop15.png
+++ /dev/null
diff --git a/res-mdpi/images/loop16.png b/res-mdpi/images/loop16.png
deleted file mode 100644
index 5cb302e6c..000000000
--- a/res-mdpi/images/loop16.png
+++ /dev/null
diff --git a/res-mdpi/images/loop17.png b/res-mdpi/images/loop17.png
deleted file mode 100644
index cdceb06ce..000000000
--- a/res-mdpi/images/loop17.png
+++ /dev/null
diff --git a/res-mdpi/images/loop18.png b/res-mdpi/images/loop18.png
deleted file mode 100644
index 27c37a8d5..000000000
--- a/res-mdpi/images/loop18.png
+++ /dev/null
diff --git a/res-mdpi/images/loop19.png b/res-mdpi/images/loop19.png
deleted file mode 100644
index 92e669637..000000000
--- a/res-mdpi/images/loop19.png
+++ /dev/null
diff --git a/res-mdpi/images/loop20.png b/res-mdpi/images/loop20.png
deleted file mode 100644
index 634a011a0..000000000
--- a/res-mdpi/images/loop20.png
+++ /dev/null
diff --git a/res-mdpi/images/loop21.png b/res-mdpi/images/loop21.png
deleted file mode 100644
index 6dc6dcc23..000000000
--- a/res-mdpi/images/loop21.png
+++ /dev/null
diff --git a/res-mdpi/images/loop22.png b/res-mdpi/images/loop22.png
deleted file mode 100644
index 19b10a575..000000000
--- a/res-mdpi/images/loop22.png
+++ /dev/null
diff --git a/res-mdpi/images/loop23.png b/res-mdpi/images/loop23.png
deleted file mode 100644
index ab68fcde6..000000000
--- a/res-mdpi/images/loop23.png
+++ /dev/null
diff --git a/res-mdpi/images/loop24.png b/res-mdpi/images/loop24.png
deleted file mode 100644
index 74541f4d1..000000000
--- a/res-mdpi/images/loop24.png
+++ /dev/null
diff --git a/res-mdpi/images/loop25.png b/res-mdpi/images/loop25.png
deleted file mode 100644
index af54a7b0e..000000000
--- a/res-mdpi/images/loop25.png
+++ /dev/null
diff --git a/res-mdpi/images/loop26.png b/res-mdpi/images/loop26.png
deleted file mode 100644
index eaa826ec5..000000000
--- a/res-mdpi/images/loop26.png
+++ /dev/null
diff --git a/res-mdpi/images/loop27.png b/res-mdpi/images/loop27.png
deleted file mode 100644
index d5fd4710a..000000000
--- a/res-mdpi/images/loop27.png
+++ /dev/null
diff --git a/res-mdpi/images/loop28.png b/res-mdpi/images/loop28.png
deleted file mode 100644
index aeb932418..000000000
--- a/res-mdpi/images/loop28.png
+++ /dev/null
diff --git a/res-mdpi/images/loop29.png b/res-mdpi/images/loop29.png
deleted file mode 100644
index 06886bce3..000000000
--- a/res-mdpi/images/loop29.png
+++ /dev/null
diff --git a/res-mdpi/images/loop30.png b/res-mdpi/images/loop30.png
deleted file mode 100644
index c0f15ef11..000000000
--- a/res-mdpi/images/loop30.png
+++ /dev/null
diff --git a/res-mdpi/images/loop31.png b/res-mdpi/images/loop31.png
deleted file mode 100644
index b166a27cb..000000000
--- a/res-mdpi/images/loop31.png
+++ /dev/null
diff --git a/res-mdpi/images/loop32.png b/res-mdpi/images/loop32.png
deleted file mode 100644
index ab5d1165b..000000000
--- a/res-mdpi/images/loop32.png
+++ /dev/null
diff --git a/res-mdpi/images/loop33.png b/res-mdpi/images/loop33.png
deleted file mode 100644
index df4f77fb1..000000000
--- a/res-mdpi/images/loop33.png
+++ /dev/null
diff --git a/res-mdpi/images/loop34.png b/res-mdpi/images/loop34.png
deleted file mode 100644
index c5663d043..000000000
--- a/res-mdpi/images/loop34.png
+++ /dev/null
diff --git a/res-mdpi/images/loop35.png b/res-mdpi/images/loop35.png
deleted file mode 100644
index 7aed6c5b2..000000000
--- a/res-mdpi/images/loop35.png
+++ /dev/null
diff --git a/res-mdpi/images/loop36.png b/res-mdpi/images/loop36.png
deleted file mode 100644
index e42a59f38..000000000
--- a/res-mdpi/images/loop36.png
+++ /dev/null
diff --git a/res-mdpi/images/loop37.png b/res-mdpi/images/loop37.png
deleted file mode 100644
index fb21da419..000000000
--- a/res-mdpi/images/loop37.png
+++ /dev/null
diff --git a/res-mdpi/images/loop38.png b/res-mdpi/images/loop38.png
deleted file mode 100644
index 314e3f76d..000000000
--- a/res-mdpi/images/loop38.png
+++ /dev/null
diff --git a/res-mdpi/images/loop39.png b/res-mdpi/images/loop39.png
deleted file mode 100644
index 77f4362ea..000000000
--- a/res-mdpi/images/loop39.png
+++ /dev/null
diff --git a/res-mdpi/images/loop40.png b/res-mdpi/images/loop40.png
deleted file mode 100644
index c3bc8b1fa..000000000
--- a/res-mdpi/images/loop40.png
+++ /dev/null
diff --git a/res-mdpi/images/loop41.png b/res-mdpi/images/loop41.png
deleted file mode 100644
index 33dcfe1d9..000000000
--- a/res-mdpi/images/loop41.png
+++ /dev/null
diff --git a/res-mdpi/images/loop42.png b/res-mdpi/images/loop42.png
deleted file mode 100644
index 7cd3c10d9..000000000
--- a/res-mdpi/images/loop42.png
+++ /dev/null
diff --git a/res-mdpi/images/loop43.png b/res-mdpi/images/loop43.png
deleted file mode 100644
index 15b152641..000000000
--- a/res-mdpi/images/loop43.png
+++ /dev/null
diff --git a/res-mdpi/images/loop44.png b/res-mdpi/images/loop44.png
deleted file mode 100644
index 3c3825d87..000000000
--- a/res-mdpi/images/loop44.png
+++ /dev/null
diff --git a/res-mdpi/images/loop45.png b/res-mdpi/images/loop45.png
deleted file mode 100644
index 6d52f3c98..000000000
--- a/res-mdpi/images/loop45.png
+++ /dev/null
diff --git a/res-mdpi/images/loop46.png b/res-mdpi/images/loop46.png
deleted file mode 100644
index 8c7fe50c9..000000000
--- a/res-mdpi/images/loop46.png
+++ /dev/null
diff --git a/res-mdpi/images/loop47.png b/res-mdpi/images/loop47.png
deleted file mode 100644
index 8ca16a465..000000000
--- a/res-mdpi/images/loop47.png
+++ /dev/null
diff --git a/res-mdpi/images/loop48.png b/res-mdpi/images/loop48.png
deleted file mode 100644
index 62acae0bd..000000000
--- a/res-mdpi/images/loop48.png
+++ /dev/null
diff --git a/res-mdpi/images/loop49.png b/res-mdpi/images/loop49.png
deleted file mode 100644
index 3c7a35515..000000000
--- a/res-mdpi/images/loop49.png
+++ /dev/null
diff --git a/res-mdpi/images/loop50.png b/res-mdpi/images/loop50.png
deleted file mode 100644
index 72add044f..000000000
--- a/res-mdpi/images/loop50.png
+++ /dev/null
diff --git a/res-mdpi/images/loop51.png b/res-mdpi/images/loop51.png
deleted file mode 100644
index 74108f1c5..000000000
--- a/res-mdpi/images/loop51.png
+++ /dev/null
diff --git a/res-mdpi/images/loop52.png b/res-mdpi/images/loop52.png
deleted file mode 100644
index bd129688f..000000000
--- a/res-mdpi/images/loop52.png
+++ /dev/null
diff --git a/res-mdpi/images/loop53.png b/res-mdpi/images/loop53.png
deleted file mode 100644
index 6af0c178c..000000000
--- a/res-mdpi/images/loop53.png
+++ /dev/null
diff --git a/res-mdpi/images/loop54.png b/res-mdpi/images/loop54.png
deleted file mode 100644
index 23f776c8c..000000000
--- a/res-mdpi/images/loop54.png
+++ /dev/null
diff --git a/res-mdpi/images/loop55.png b/res-mdpi/images/loop55.png
deleted file mode 100644
index d2d03c810..000000000
--- a/res-mdpi/images/loop55.png
+++ /dev/null
diff --git a/res-mdpi/images/loop56.png b/res-mdpi/images/loop56.png
deleted file mode 100644
index 13e73ed11..000000000
--- a/res-mdpi/images/loop56.png
+++ /dev/null
diff --git a/res-mdpi/images/loop57.png b/res-mdpi/images/loop57.png
deleted file mode 100644
index c2b81b6a5..000000000
--- a/res-mdpi/images/loop57.png
+++ /dev/null
diff --git a/res-mdpi/images/loop58.png b/res-mdpi/images/loop58.png
deleted file mode 100644
index d99cd74e5..000000000
--- a/res-mdpi/images/loop58.png
+++ /dev/null
diff --git a/res-mdpi/images/loop59.png b/res-mdpi/images/loop59.png
deleted file mode 100644
index 8a36210dc..000000000
--- a/res-mdpi/images/loop59.png
+++ /dev/null
diff --git a/res-mdpi/images/loop60.png b/res-mdpi/images/loop60.png
deleted file mode 100644
index dc957fba9..000000000
--- a/res-mdpi/images/loop60.png
+++ /dev/null
diff --git a/res-mdpi/images/loop61.png b/res-mdpi/images/loop61.png
deleted file mode 100644
index ea29c2977..000000000
--- a/res-mdpi/images/loop61.png
+++ /dev/null
diff --git a/res-mdpi/images/loop62.png b/res-mdpi/images/loop62.png
deleted file mode 100644
index 608a868b2..000000000
--- a/res-mdpi/images/loop62.png
+++ /dev/null
diff --git a/res-mdpi/images/loop63.png b/res-mdpi/images/loop63.png
deleted file mode 100644
index f65a3b707..000000000
--- a/res-mdpi/images/loop63.png
+++ /dev/null
diff --git a/res-mdpi/images/loop64.png b/res-mdpi/images/loop64.png
deleted file mode 100644
index 5b27105fd..000000000
--- a/res-mdpi/images/loop64.png
+++ /dev/null
diff --git a/res-mdpi/images/loop65.png b/res-mdpi/images/loop65.png
deleted file mode 100644
index 4ec41bf90..000000000
--- a/res-mdpi/images/loop65.png
+++ /dev/null
diff --git a/res-mdpi/images/loop66.png b/res-mdpi/images/loop66.png
deleted file mode 100644
index b0845b589..000000000
--- a/res-mdpi/images/loop66.png
+++ /dev/null
diff --git a/res-mdpi/images/loop67.png b/res-mdpi/images/loop67.png
deleted file mode 100644
index 30fae6e1a..000000000
--- a/res-mdpi/images/loop67.png
+++ /dev/null
diff --git a/res-mdpi/images/loop68.png b/res-mdpi/images/loop68.png
deleted file mode 100644
index fc90fca5c..000000000
--- a/res-mdpi/images/loop68.png
+++ /dev/null
diff --git a/res-mdpi/images/loop69.png b/res-mdpi/images/loop69.png
deleted file mode 100644
index da3564310..000000000
--- a/res-mdpi/images/loop69.png
+++ /dev/null
diff --git a/res-mdpi/images/loop70.png b/res-mdpi/images/loop70.png
deleted file mode 100644
index baf515390..000000000
--- a/res-mdpi/images/loop70.png
+++ /dev/null
diff --git a/res-mdpi/images/loop71.png b/res-mdpi/images/loop71.png
deleted file mode 100644
index 3b013c7d4..000000000
--- a/res-mdpi/images/loop71.png
+++ /dev/null
diff --git a/res-mdpi/images/loop72.png b/res-mdpi/images/loop72.png
deleted file mode 100644
index 7f5599291..000000000
--- a/res-mdpi/images/loop72.png
+++ /dev/null
diff --git a/res-mdpi/images/loop73.png b/res-mdpi/images/loop73.png
deleted file mode 100644
index 85a419483..000000000
--- a/res-mdpi/images/loop73.png
+++ /dev/null
diff --git a/res-mdpi/images/loop74.png b/res-mdpi/images/loop74.png
deleted file mode 100644
index 740f37e22..000000000
--- a/res-mdpi/images/loop74.png
+++ /dev/null
diff --git a/res-mdpi/images/loop75.png b/res-mdpi/images/loop75.png
deleted file mode 100644
index cfb3d6f1f..000000000
--- a/res-mdpi/images/loop75.png
+++ /dev/null
diff --git a/res-mdpi/images/loop76.png b/res-mdpi/images/loop76.png
deleted file mode 100644
index 15c841dc7..000000000
--- a/res-mdpi/images/loop76.png
+++ /dev/null
diff --git a/res-mdpi/images/loop77.png b/res-mdpi/images/loop77.png
deleted file mode 100644
index b27772551..000000000
--- a/res-mdpi/images/loop77.png
+++ /dev/null
diff --git a/res-mdpi/images/loop78.png b/res-mdpi/images/loop78.png
deleted file mode 100644
index 2744a9ac7..000000000
--- a/res-mdpi/images/loop78.png
+++ /dev/null
diff --git a/res-mdpi/images/loop79.png b/res-mdpi/images/loop79.png
deleted file mode 100644
index 40f4908d3..000000000
--- a/res-mdpi/images/loop79.png
+++ /dev/null
diff --git a/res-mdpi/images/loop80.png b/res-mdpi/images/loop80.png
deleted file mode 100644
index cd969ec3a..000000000
--- a/res-mdpi/images/loop80.png
+++ /dev/null
diff --git a/res-mdpi/images/loop81.png b/res-mdpi/images/loop81.png
deleted file mode 100644
index e388ac017..000000000
--- a/res-mdpi/images/loop81.png
+++ /dev/null
diff --git a/res-mdpi/images/loop82.png b/res-mdpi/images/loop82.png
deleted file mode 100644
index 134bebba2..000000000
--- a/res-mdpi/images/loop82.png
+++ /dev/null
diff --git a/res-mdpi/images/loop83.png b/res-mdpi/images/loop83.png
deleted file mode 100644
index bdc71dd24..000000000
--- a/res-mdpi/images/loop83.png
+++ /dev/null
diff --git a/res-mdpi/images/loop84.png b/res-mdpi/images/loop84.png
deleted file mode 100644
index e630af397..000000000
--- a/res-mdpi/images/loop84.png
+++ /dev/null
diff --git a/res-mdpi/images/loop85.png b/res-mdpi/images/loop85.png
deleted file mode 100644
index a936c986c..000000000
--- a/res-mdpi/images/loop85.png
+++ /dev/null
diff --git a/res-mdpi/images/loop86.png b/res-mdpi/images/loop86.png
deleted file mode 100644
index 53b3e5168..000000000
--- a/res-mdpi/images/loop86.png
+++ /dev/null
diff --git a/res-mdpi/images/loop87.png b/res-mdpi/images/loop87.png
deleted file mode 100644
index 982619394..000000000
--- a/res-mdpi/images/loop87.png
+++ /dev/null
diff --git a/res-mdpi/images/loop88.png b/res-mdpi/images/loop88.png
deleted file mode 100644
index 00f682bd1..000000000
--- a/res-mdpi/images/loop88.png
+++ /dev/null
diff --git a/res-mdpi/images/loop89.png b/res-mdpi/images/loop89.png
deleted file mode 100644
index 293b507c2..000000000
--- a/res-mdpi/images/loop89.png
+++ /dev/null
diff --git a/res-mdpi/images/loop90.png b/res-mdpi/images/loop90.png
deleted file mode 100644
index 20bebb0e0..000000000
--- a/res-mdpi/images/loop90.png
+++ /dev/null
diff --git a/res-mdpi/images/no_command_text.png b/res-mdpi/images/no_command_text.png
index 1f29b8951..80ff1e5f3 100644
--- a/res-mdpi/images/no_command_text.png
+++ b/res-mdpi/images/no_command_text.png
diff --git a/res-xhdpi/images/erasing_text.png b/res-xhdpi/images/erasing_text.png
index f88e0e6a8..600fe255f 100644
--- a/res-xhdpi/images/erasing_text.png
+++ b/res-xhdpi/images/erasing_text.png
diff --git a/res-xhdpi/images/error_text.png b/res-xhdpi/images/error_text.png
index c3a4cc6f8..863591548 100644
--- a/res-xhdpi/images/error_text.png
+++ b/res-xhdpi/images/error_text.png
diff --git a/res-xhdpi/images/installing_security_text.png b/res-xhdpi/images/installing_security_text.png
new file mode 100644
index 000000000..7ff56506c
--- /dev/null
+++ b/res-xhdpi/images/installing_security_text.png
diff --git a/res-xhdpi/images/installing_text.png b/res-xhdpi/images/installing_text.png
index a4dacd0f6..ba2c7c168 100644
--- a/res-xhdpi/images/installing_text.png
+++ b/res-xhdpi/images/installing_text.png
diff --git a/res-xhdpi/images/loop00.png b/res-xhdpi/images/loop00.png
index 45393eac2..d360c79c5 100644
--- a/res-xhdpi/images/loop00.png
+++ b/res-xhdpi/images/loop00.png
diff --git a/res-xhdpi/images/loop01.png b/res-xhdpi/images/loop01.png
index d410fc0ed..a0b7ac665 100644
--- a/res-xhdpi/images/loop01.png
+++ b/res-xhdpi/images/loop01.png
diff --git a/res-xhdpi/images/loop02.png b/res-xhdpi/images/loop02.png
index 49c98a34e..739c5805a 100644
--- a/res-xhdpi/images/loop02.png
+++ b/res-xhdpi/images/loop02.png
diff --git a/res-xhdpi/images/loop03.png b/res-xhdpi/images/loop03.png
index b9ce0f584..98a4890ad 100644
--- a/res-xhdpi/images/loop03.png
+++ b/res-xhdpi/images/loop03.png
diff --git a/res-xhdpi/images/loop04.png b/res-xhdpi/images/loop04.png
index 8391f60c1..df6a09e34 100644
--- a/res-xhdpi/images/loop04.png
+++ b/res-xhdpi/images/loop04.png
diff --git a/res-xhdpi/images/loop05.png b/res-xhdpi/images/loop05.png
index f76ad1b08..4d8d56de4 100644
--- a/res-xhdpi/images/loop05.png
+++ b/res-xhdpi/images/loop05.png
diff --git a/res-xhdpi/images/loop06.png b/res-xhdpi/images/loop06.png
index a53c56749..c5f26f108 100644
--- a/res-xhdpi/images/loop06.png
+++ b/res-xhdpi/images/loop06.png
diff --git a/res-xhdpi/images/loop07.png b/res-xhdpi/images/loop07.png
deleted file mode 100644
index 40b48dbdd..000000000
--- a/res-xhdpi/images/loop07.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop08.png b/res-xhdpi/images/loop08.png
deleted file mode 100644
index ea33f0c77..000000000
--- a/res-xhdpi/images/loop08.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop09.png b/res-xhdpi/images/loop09.png
deleted file mode 100644
index 1c93a9c73..000000000
--- a/res-xhdpi/images/loop09.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop10.png b/res-xhdpi/images/loop10.png
deleted file mode 100644
index 88309a498..000000000
--- a/res-xhdpi/images/loop10.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop11.png b/res-xhdpi/images/loop11.png
deleted file mode 100644
index ae34ccfe7..000000000
--- a/res-xhdpi/images/loop11.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop12.png b/res-xhdpi/images/loop12.png
deleted file mode 100644
index ee07cbc6b..000000000
--- a/res-xhdpi/images/loop12.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop13.png b/res-xhdpi/images/loop13.png
deleted file mode 100644
index c1b7a7829..000000000
--- a/res-xhdpi/images/loop13.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop14.png b/res-xhdpi/images/loop14.png
deleted file mode 100644
index 26ced74af..000000000
--- a/res-xhdpi/images/loop14.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop15.png b/res-xhdpi/images/loop15.png
deleted file mode 100644
index 3cd3f3c7f..000000000
--- a/res-xhdpi/images/loop15.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop16.png b/res-xhdpi/images/loop16.png
deleted file mode 100644
index 67f6dd3d8..000000000
--- a/res-xhdpi/images/loop16.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop17.png b/res-xhdpi/images/loop17.png
deleted file mode 100644
index c2ddbd0b7..000000000
--- a/res-xhdpi/images/loop17.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop18.png b/res-xhdpi/images/loop18.png
deleted file mode 100644
index 14590aaf9..000000000
--- a/res-xhdpi/images/loop18.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop19.png b/res-xhdpi/images/loop19.png
deleted file mode 100644
index 0c6c828c7..000000000
--- a/res-xhdpi/images/loop19.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop20.png b/res-xhdpi/images/loop20.png
deleted file mode 100644
index ab0572c6d..000000000
--- a/res-xhdpi/images/loop20.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop21.png b/res-xhdpi/images/loop21.png
deleted file mode 100644
index 1ed54e5df..000000000
--- a/res-xhdpi/images/loop21.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop22.png b/res-xhdpi/images/loop22.png
deleted file mode 100644
index 9e894c753..000000000
--- a/res-xhdpi/images/loop22.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop23.png b/res-xhdpi/images/loop23.png
deleted file mode 100644
index 87c44c559..000000000
--- a/res-xhdpi/images/loop23.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop24.png b/res-xhdpi/images/loop24.png
deleted file mode 100644
index 9dcebd94e..000000000
--- a/res-xhdpi/images/loop24.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop25.png b/res-xhdpi/images/loop25.png
deleted file mode 100644
index 600c1e90a..000000000
--- a/res-xhdpi/images/loop25.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop26.png b/res-xhdpi/images/loop26.png
deleted file mode 100644
index 575e808cd..000000000
--- a/res-xhdpi/images/loop26.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop27.png b/res-xhdpi/images/loop27.png
deleted file mode 100644
index 3c7908dc1..000000000
--- a/res-xhdpi/images/loop27.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop28.png b/res-xhdpi/images/loop28.png
deleted file mode 100644
index 31bc00823..000000000
--- a/res-xhdpi/images/loop28.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop29.png b/res-xhdpi/images/loop29.png
deleted file mode 100644
index 7797b39a4..000000000
--- a/res-xhdpi/images/loop29.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop30.png b/res-xhdpi/images/loop30.png
deleted file mode 100644
index 234970cb4..000000000
--- a/res-xhdpi/images/loop30.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop31.png b/res-xhdpi/images/loop31.png
deleted file mode 100644
index cd87e1b3c..000000000
--- a/res-xhdpi/images/loop31.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop32.png b/res-xhdpi/images/loop32.png
deleted file mode 100644
index 263dd0d98..000000000
--- a/res-xhdpi/images/loop32.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop33.png b/res-xhdpi/images/loop33.png
deleted file mode 100644
index 62cbd5ceb..000000000
--- a/res-xhdpi/images/loop33.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop34.png b/res-xhdpi/images/loop34.png
deleted file mode 100644
index 7ab585623..000000000
--- a/res-xhdpi/images/loop34.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop35.png b/res-xhdpi/images/loop35.png
deleted file mode 100644
index 2b124e936..000000000
--- a/res-xhdpi/images/loop35.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop36.png b/res-xhdpi/images/loop36.png
deleted file mode 100644
index b5b74be51..000000000
--- a/res-xhdpi/images/loop36.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop37.png b/res-xhdpi/images/loop37.png
deleted file mode 100644
index cad4c4278..000000000
--- a/res-xhdpi/images/loop37.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop38.png b/res-xhdpi/images/loop38.png
deleted file mode 100644
index 4a83e1806..000000000
--- a/res-xhdpi/images/loop38.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop39.png b/res-xhdpi/images/loop39.png
deleted file mode 100644
index 454a03eb7..000000000
--- a/res-xhdpi/images/loop39.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop40.png b/res-xhdpi/images/loop40.png
deleted file mode 100644
index 093f44bff..000000000
--- a/res-xhdpi/images/loop40.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop41.png b/res-xhdpi/images/loop41.png
deleted file mode 100644
index c1730327e..000000000
--- a/res-xhdpi/images/loop41.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop42.png b/res-xhdpi/images/loop42.png
deleted file mode 100644
index 4b4072aa2..000000000
--- a/res-xhdpi/images/loop42.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop43.png b/res-xhdpi/images/loop43.png
deleted file mode 100644
index 33a03d28d..000000000
--- a/res-xhdpi/images/loop43.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop44.png b/res-xhdpi/images/loop44.png
deleted file mode 100644
index 1965294b3..000000000
--- a/res-xhdpi/images/loop44.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop45.png b/res-xhdpi/images/loop45.png
deleted file mode 100644
index 0bf16daa5..000000000
--- a/res-xhdpi/images/loop45.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop46.png b/res-xhdpi/images/loop46.png
deleted file mode 100644
index 81255bc90..000000000
--- a/res-xhdpi/images/loop46.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop47.png b/res-xhdpi/images/loop47.png
deleted file mode 100644
index e1e171053..000000000
--- a/res-xhdpi/images/loop47.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop48.png b/res-xhdpi/images/loop48.png
deleted file mode 100644
index 9d515ca7d..000000000
--- a/res-xhdpi/images/loop48.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop49.png b/res-xhdpi/images/loop49.png
deleted file mode 100644
index 6cb515c72..000000000
--- a/res-xhdpi/images/loop49.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop50.png b/res-xhdpi/images/loop50.png
deleted file mode 100644
index 310ba7200..000000000
--- a/res-xhdpi/images/loop50.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop51.png b/res-xhdpi/images/loop51.png
deleted file mode 100644
index 283f7eb37..000000000
--- a/res-xhdpi/images/loop51.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop52.png b/res-xhdpi/images/loop52.png
deleted file mode 100644
index 141004fa1..000000000
--- a/res-xhdpi/images/loop52.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop53.png b/res-xhdpi/images/loop53.png
deleted file mode 100644
index 1b4649cd3..000000000
--- a/res-xhdpi/images/loop53.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop54.png b/res-xhdpi/images/loop54.png
deleted file mode 100644
index 3210b4a79..000000000
--- a/res-xhdpi/images/loop54.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop55.png b/res-xhdpi/images/loop55.png
deleted file mode 100644
index b1d9ea0b9..000000000
--- a/res-xhdpi/images/loop55.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop56.png b/res-xhdpi/images/loop56.png
deleted file mode 100644
index 1ae612667..000000000
--- a/res-xhdpi/images/loop56.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop57.png b/res-xhdpi/images/loop57.png
deleted file mode 100644
index 6317e8812..000000000
--- a/res-xhdpi/images/loop57.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop58.png b/res-xhdpi/images/loop58.png
deleted file mode 100644
index b275a31d5..000000000
--- a/res-xhdpi/images/loop58.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop59.png b/res-xhdpi/images/loop59.png
deleted file mode 100644
index 9bc3ba05e..000000000
--- a/res-xhdpi/images/loop59.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop60.png b/res-xhdpi/images/loop60.png
deleted file mode 100644
index b6a9e64ec..000000000
--- a/res-xhdpi/images/loop60.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop61.png b/res-xhdpi/images/loop61.png
deleted file mode 100644
index fee9beeba..000000000
--- a/res-xhdpi/images/loop61.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop62.png b/res-xhdpi/images/loop62.png
deleted file mode 100644
index e153319ae..000000000
--- a/res-xhdpi/images/loop62.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop63.png b/res-xhdpi/images/loop63.png
deleted file mode 100644
index a2d9efd44..000000000
--- a/res-xhdpi/images/loop63.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop64.png b/res-xhdpi/images/loop64.png
deleted file mode 100644
index 6cfdc5a8e..000000000
--- a/res-xhdpi/images/loop64.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop65.png b/res-xhdpi/images/loop65.png
deleted file mode 100644
index 2806b1cfe..000000000
--- a/res-xhdpi/images/loop65.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop66.png b/res-xhdpi/images/loop66.png
deleted file mode 100644
index fc51ee94f..000000000
--- a/res-xhdpi/images/loop66.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop67.png b/res-xhdpi/images/loop67.png
deleted file mode 100644
index d85ebf3fc..000000000
--- a/res-xhdpi/images/loop67.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop68.png b/res-xhdpi/images/loop68.png
deleted file mode 100644
index 8f5437abf..000000000
--- a/res-xhdpi/images/loop68.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop69.png b/res-xhdpi/images/loop69.png
deleted file mode 100644
index b426c539f..000000000
--- a/res-xhdpi/images/loop69.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop70.png b/res-xhdpi/images/loop70.png
deleted file mode 100644
index 854189004..000000000
--- a/res-xhdpi/images/loop70.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop71.png b/res-xhdpi/images/loop71.png
deleted file mode 100644
index 2aa0fbf29..000000000
--- a/res-xhdpi/images/loop71.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop72.png b/res-xhdpi/images/loop72.png
deleted file mode 100644
index dfe61c971..000000000
--- a/res-xhdpi/images/loop72.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop73.png b/res-xhdpi/images/loop73.png
deleted file mode 100644
index 4b235b541..000000000
--- a/res-xhdpi/images/loop73.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop74.png b/res-xhdpi/images/loop74.png
deleted file mode 100644
index 31e4c0e98..000000000
--- a/res-xhdpi/images/loop74.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop75.png b/res-xhdpi/images/loop75.png
deleted file mode 100644
index 68197f564..000000000
--- a/res-xhdpi/images/loop75.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop76.png b/res-xhdpi/images/loop76.png
deleted file mode 100644
index cff8f4ab0..000000000
--- a/res-xhdpi/images/loop76.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop77.png b/res-xhdpi/images/loop77.png
deleted file mode 100644
index 3b38a39d6..000000000
--- a/res-xhdpi/images/loop77.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop78.png b/res-xhdpi/images/loop78.png
deleted file mode 100644
index 8d3562496..000000000
--- a/res-xhdpi/images/loop78.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop79.png b/res-xhdpi/images/loop79.png
deleted file mode 100644
index e8cdbe021..000000000
--- a/res-xhdpi/images/loop79.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop80.png b/res-xhdpi/images/loop80.png
deleted file mode 100644
index 5b26b4892..000000000
--- a/res-xhdpi/images/loop80.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop81.png b/res-xhdpi/images/loop81.png
deleted file mode 100644
index 135b61ef8..000000000
--- a/res-xhdpi/images/loop81.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop82.png b/res-xhdpi/images/loop82.png
deleted file mode 100644
index 51da110f0..000000000
--- a/res-xhdpi/images/loop82.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop83.png b/res-xhdpi/images/loop83.png
deleted file mode 100644
index 84888a9fd..000000000
--- a/res-xhdpi/images/loop83.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop84.png b/res-xhdpi/images/loop84.png
deleted file mode 100644
index 014334400..000000000
--- a/res-xhdpi/images/loop84.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop85.png b/res-xhdpi/images/loop85.png
deleted file mode 100644
index 58367781b..000000000
--- a/res-xhdpi/images/loop85.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop86.png b/res-xhdpi/images/loop86.png
deleted file mode 100644
index 00166a9d4..000000000
--- a/res-xhdpi/images/loop86.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop87.png b/res-xhdpi/images/loop87.png
deleted file mode 100644
index b6f008982..000000000
--- a/res-xhdpi/images/loop87.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop88.png b/res-xhdpi/images/loop88.png
deleted file mode 100644
index 77b5b4262..000000000
--- a/res-xhdpi/images/loop88.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop89.png b/res-xhdpi/images/loop89.png
deleted file mode 100644
index 4beb1f04f..000000000
--- a/res-xhdpi/images/loop89.png
+++ /dev/null
diff --git a/res-xhdpi/images/loop90.png b/res-xhdpi/images/loop90.png
deleted file mode 100644
index 45393eac2..000000000
--- a/res-xhdpi/images/loop90.png
+++ /dev/null
diff --git a/res-xhdpi/images/no_command_text.png b/res-xhdpi/images/no_command_text.png
index eb34e94b3..ed56e1aea 100644
--- a/res-xhdpi/images/no_command_text.png
+++ b/res-xhdpi/images/no_command_text.png
diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png
index c87fd52b4..c128c7be4 100644
--- a/res-xxhdpi/images/erasing_text.png
+++ b/res-xxhdpi/images/erasing_text.png
diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png
index 486e951df..c239da986 100644
--- a/res-xxhdpi/images/error_text.png
+++ b/res-xxhdpi/images/error_text.png
diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png
new file mode 100644
index 000000000..5af4e4570
--- /dev/null
+++ b/res-xxhdpi/images/installing_security_text.png
diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png
index ef6e8f3f0..455b03e8c 100644
--- a/res-xxhdpi/images/installing_text.png
+++ b/res-xxhdpi/images/installing_text.png
diff --git a/res-xxhdpi/images/loop00.png b/res-xxhdpi/images/loop00.png
index 9d6154452..d360c79c5 100644
--- a/res-xxhdpi/images/loop00.png
+++ b/res-xxhdpi/images/loop00.png
diff --git a/res-xxhdpi/images/loop01.png b/res-xxhdpi/images/loop01.png
index 024bf6cea..a0b7ac665 100644
--- a/res-xxhdpi/images/loop01.png
+++ b/res-xxhdpi/images/loop01.png
diff --git a/res-xxhdpi/images/loop02.png b/res-xxhdpi/images/loop02.png
index 4f6cbf208..739c5805a 100644
--- a/res-xxhdpi/images/loop02.png
+++ b/res-xxhdpi/images/loop02.png
diff --git a/res-xxhdpi/images/loop03.png b/res-xxhdpi/images/loop03.png
index 2f3287dfb..98a4890ad 100644
--- a/res-xxhdpi/images/loop03.png
+++ b/res-xxhdpi/images/loop03.png
diff --git a/res-xxhdpi/images/loop04.png b/res-xxhdpi/images/loop04.png
index bc979ccb7..df6a09e34 100644
--- a/res-xxhdpi/images/loop04.png
+++ b/res-xxhdpi/images/loop04.png
diff --git a/res-xxhdpi/images/loop05.png b/res-xxhdpi/images/loop05.png
index b1733db35..4d8d56de4 100644
--- a/res-xxhdpi/images/loop05.png
+++ b/res-xxhdpi/images/loop05.png
diff --git a/res-xxhdpi/images/loop06.png b/res-xxhdpi/images/loop06.png
index 46f629124..c5f26f108 100644
--- a/res-xxhdpi/images/loop06.png
+++ b/res-xxhdpi/images/loop06.png
diff --git a/res-xxhdpi/images/loop07.png b/res-xxhdpi/images/loop07.png
deleted file mode 100644
index ead912a2b..000000000
--- a/res-xxhdpi/images/loop07.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop08.png b/res-xxhdpi/images/loop08.png
deleted file mode 100644
index d693b5b32..000000000
--- a/res-xxhdpi/images/loop08.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop09.png b/res-xxhdpi/images/loop09.png
deleted file mode 100644
index 06c703426..000000000
--- a/res-xxhdpi/images/loop09.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop10.png b/res-xxhdpi/images/loop10.png
deleted file mode 100644
index 0875b917a..000000000
--- a/res-xxhdpi/images/loop10.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop11.png b/res-xxhdpi/images/loop11.png
deleted file mode 100644
index 1b0f18eee..000000000
--- a/res-xxhdpi/images/loop11.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop12.png b/res-xxhdpi/images/loop12.png
deleted file mode 100644
index 540d2927e..000000000
--- a/res-xxhdpi/images/loop12.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop13.png b/res-xxhdpi/images/loop13.png
deleted file mode 100644
index 5a85eff89..000000000
--- a/res-xxhdpi/images/loop13.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop14.png b/res-xxhdpi/images/loop14.png
deleted file mode 100644
index e94ea24ad..000000000
--- a/res-xxhdpi/images/loop14.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop15.png b/res-xxhdpi/images/loop15.png
deleted file mode 100644
index c1a78f50a..000000000
--- a/res-xxhdpi/images/loop15.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop16.png b/res-xxhdpi/images/loop16.png
deleted file mode 100644
index 7cb3e9aa5..000000000
--- a/res-xxhdpi/images/loop16.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop17.png b/res-xxhdpi/images/loop17.png
deleted file mode 100644
index 1ad8497a2..000000000
--- a/res-xxhdpi/images/loop17.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop18.png b/res-xxhdpi/images/loop18.png
deleted file mode 100644
index fb82ebe00..000000000
--- a/res-xxhdpi/images/loop18.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop19.png b/res-xxhdpi/images/loop19.png
deleted file mode 100644
index 217d34bf9..000000000
--- a/res-xxhdpi/images/loop19.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop20.png b/res-xxhdpi/images/loop20.png
deleted file mode 100644
index f1cfe78ae..000000000
--- a/res-xxhdpi/images/loop20.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop21.png b/res-xxhdpi/images/loop21.png
deleted file mode 100644
index 184c86b41..000000000
--- a/res-xxhdpi/images/loop21.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop22.png b/res-xxhdpi/images/loop22.png
deleted file mode 100644
index 68e3b2a31..000000000
--- a/res-xxhdpi/images/loop22.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop23.png b/res-xxhdpi/images/loop23.png
deleted file mode 100644
index af188318d..000000000
--- a/res-xxhdpi/images/loop23.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop24.png b/res-xxhdpi/images/loop24.png
deleted file mode 100644
index dd7c4a518..000000000
--- a/res-xxhdpi/images/loop24.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop25.png b/res-xxhdpi/images/loop25.png
deleted file mode 100644
index c58c08d24..000000000
--- a/res-xxhdpi/images/loop25.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop26.png b/res-xxhdpi/images/loop26.png
deleted file mode 100644
index 4409e551e..000000000
--- a/res-xxhdpi/images/loop26.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop27.png b/res-xxhdpi/images/loop27.png
deleted file mode 100644
index e96e1fdb7..000000000
--- a/res-xxhdpi/images/loop27.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop28.png b/res-xxhdpi/images/loop28.png
deleted file mode 100644
index d36ffa91e..000000000
--- a/res-xxhdpi/images/loop28.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop29.png b/res-xxhdpi/images/loop29.png
deleted file mode 100644
index 936a57052..000000000
--- a/res-xxhdpi/images/loop29.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop30.png b/res-xxhdpi/images/loop30.png
deleted file mode 100644
index b5c5e0490..000000000
--- a/res-xxhdpi/images/loop30.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop31.png b/res-xxhdpi/images/loop31.png
deleted file mode 100644
index 1e2aa8b3f..000000000
--- a/res-xxhdpi/images/loop31.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop32.png b/res-xxhdpi/images/loop32.png
deleted file mode 100644
index 638ec8bc1..000000000
--- a/res-xxhdpi/images/loop32.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop33.png b/res-xxhdpi/images/loop33.png
deleted file mode 100644
index cb62a36a0..000000000
--- a/res-xxhdpi/images/loop33.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop34.png b/res-xxhdpi/images/loop34.png
deleted file mode 100644
index ac877b83d..000000000
--- a/res-xxhdpi/images/loop34.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop35.png b/res-xxhdpi/images/loop35.png
deleted file mode 100644
index 567cbf1ca..000000000
--- a/res-xxhdpi/images/loop35.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop36.png b/res-xxhdpi/images/loop36.png
deleted file mode 100644
index b1c6220e3..000000000
--- a/res-xxhdpi/images/loop36.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop37.png b/res-xxhdpi/images/loop37.png
deleted file mode 100644
index ad40b757d..000000000
--- a/res-xxhdpi/images/loop37.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop38.png b/res-xxhdpi/images/loop38.png
deleted file mode 100644
index 87be4ef39..000000000
--- a/res-xxhdpi/images/loop38.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop39.png b/res-xxhdpi/images/loop39.png
deleted file mode 100644
index fecaa1ff2..000000000
--- a/res-xxhdpi/images/loop39.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop40.png b/res-xxhdpi/images/loop40.png
deleted file mode 100644
index 849caaa2d..000000000
--- a/res-xxhdpi/images/loop40.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop41.png b/res-xxhdpi/images/loop41.png
deleted file mode 100644
index 9c0b81f48..000000000
--- a/res-xxhdpi/images/loop41.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop42.png b/res-xxhdpi/images/loop42.png
deleted file mode 100644
index 9c8657326..000000000
--- a/res-xxhdpi/images/loop42.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop43.png b/res-xxhdpi/images/loop43.png
deleted file mode 100644
index 1a5f88822..000000000
--- a/res-xxhdpi/images/loop43.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop44.png b/res-xxhdpi/images/loop44.png
deleted file mode 100644
index 2b4a449a7..000000000
--- a/res-xxhdpi/images/loop44.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop45.png b/res-xxhdpi/images/loop45.png
deleted file mode 100644
index 11cc31c37..000000000
--- a/res-xxhdpi/images/loop45.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop46.png b/res-xxhdpi/images/loop46.png
deleted file mode 100644
index 95f3f993c..000000000
--- a/res-xxhdpi/images/loop46.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop47.png b/res-xxhdpi/images/loop47.png
deleted file mode 100644
index ed991154e..000000000
--- a/res-xxhdpi/images/loop47.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop48.png b/res-xxhdpi/images/loop48.png
deleted file mode 100644
index e39761c5c..000000000
--- a/res-xxhdpi/images/loop48.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop49.png b/res-xxhdpi/images/loop49.png
deleted file mode 100644
index 65ec56034..000000000
--- a/res-xxhdpi/images/loop49.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop50.png b/res-xxhdpi/images/loop50.png
deleted file mode 100644
index 82631d9db..000000000
--- a/res-xxhdpi/images/loop50.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop51.png b/res-xxhdpi/images/loop51.png
deleted file mode 100644
index eb3910c31..000000000
--- a/res-xxhdpi/images/loop51.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop52.png b/res-xxhdpi/images/loop52.png
deleted file mode 100644
index 64ec1ad96..000000000
--- a/res-xxhdpi/images/loop52.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop53.png b/res-xxhdpi/images/loop53.png
deleted file mode 100644
index e71c97145..000000000
--- a/res-xxhdpi/images/loop53.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop54.png b/res-xxhdpi/images/loop54.png
deleted file mode 100644
index 877e15218..000000000
--- a/res-xxhdpi/images/loop54.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop55.png b/res-xxhdpi/images/loop55.png
deleted file mode 100644
index 0a8f8f091..000000000
--- a/res-xxhdpi/images/loop55.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop56.png b/res-xxhdpi/images/loop56.png
deleted file mode 100644
index ed9eff998..000000000
--- a/res-xxhdpi/images/loop56.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop57.png b/res-xxhdpi/images/loop57.png
deleted file mode 100644
index 9afb74557..000000000
--- a/res-xxhdpi/images/loop57.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop58.png b/res-xxhdpi/images/loop58.png
deleted file mode 100644
index 775514eb8..000000000
--- a/res-xxhdpi/images/loop58.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop59.png b/res-xxhdpi/images/loop59.png
deleted file mode 100644
index b22a3a7fa..000000000
--- a/res-xxhdpi/images/loop59.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop60.png b/res-xxhdpi/images/loop60.png
deleted file mode 100644
index 94905cab2..000000000
--- a/res-xxhdpi/images/loop60.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop61.png b/res-xxhdpi/images/loop61.png
deleted file mode 100644
index bb9670ccd..000000000
--- a/res-xxhdpi/images/loop61.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop62.png b/res-xxhdpi/images/loop62.png
deleted file mode 100644
index 1acf5ac57..000000000
--- a/res-xxhdpi/images/loop62.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop63.png b/res-xxhdpi/images/loop63.png
deleted file mode 100644
index 03f562086..000000000
--- a/res-xxhdpi/images/loop63.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop64.png b/res-xxhdpi/images/loop64.png
deleted file mode 100644
index 7a5ce1824..000000000
--- a/res-xxhdpi/images/loop64.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop65.png b/res-xxhdpi/images/loop65.png
deleted file mode 100644
index 022b64601..000000000
--- a/res-xxhdpi/images/loop65.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop66.png b/res-xxhdpi/images/loop66.png
deleted file mode 100644
index 9fd326404..000000000
--- a/res-xxhdpi/images/loop66.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop67.png b/res-xxhdpi/images/loop67.png
deleted file mode 100644
index b05e20e11..000000000
--- a/res-xxhdpi/images/loop67.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop68.png b/res-xxhdpi/images/loop68.png
deleted file mode 100644
index 66556f94d..000000000
--- a/res-xxhdpi/images/loop68.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop69.png b/res-xxhdpi/images/loop69.png
deleted file mode 100644
index 34150c3a7..000000000
--- a/res-xxhdpi/images/loop69.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop70.png b/res-xxhdpi/images/loop70.png
deleted file mode 100644
index 007f5953d..000000000
--- a/res-xxhdpi/images/loop70.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop71.png b/res-xxhdpi/images/loop71.png
deleted file mode 100644
index 6db5c64f6..000000000
--- a/res-xxhdpi/images/loop71.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop72.png b/res-xxhdpi/images/loop72.png
deleted file mode 100644
index 6e9d8e825..000000000
--- a/res-xxhdpi/images/loop72.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop73.png b/res-xxhdpi/images/loop73.png
deleted file mode 100644
index 90c87d358..000000000
--- a/res-xxhdpi/images/loop73.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop74.png b/res-xxhdpi/images/loop74.png
deleted file mode 100644
index c0fe8dd07..000000000
--- a/res-xxhdpi/images/loop74.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop75.png b/res-xxhdpi/images/loop75.png
deleted file mode 100644
index 185355820..000000000
--- a/res-xxhdpi/images/loop75.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop76.png b/res-xxhdpi/images/loop76.png
deleted file mode 100644
index 911ffeaf5..000000000
--- a/res-xxhdpi/images/loop76.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop77.png b/res-xxhdpi/images/loop77.png
deleted file mode 100644
index 87861a20b..000000000
--- a/res-xxhdpi/images/loop77.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop78.png b/res-xxhdpi/images/loop78.png
deleted file mode 100644
index 4b61b5208..000000000
--- a/res-xxhdpi/images/loop78.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop79.png b/res-xxhdpi/images/loop79.png
deleted file mode 100644
index dea4bcf14..000000000
--- a/res-xxhdpi/images/loop79.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop80.png b/res-xxhdpi/images/loop80.png
deleted file mode 100644
index dab06f389..000000000
--- a/res-xxhdpi/images/loop80.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop81.png b/res-xxhdpi/images/loop81.png
deleted file mode 100644
index 4d74671af..000000000
--- a/res-xxhdpi/images/loop81.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop82.png b/res-xxhdpi/images/loop82.png
deleted file mode 100644
index 7124c88a1..000000000
--- a/res-xxhdpi/images/loop82.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop83.png b/res-xxhdpi/images/loop83.png
deleted file mode 100644
index c8cc938a2..000000000
--- a/res-xxhdpi/images/loop83.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop84.png b/res-xxhdpi/images/loop84.png
deleted file mode 100644
index dbfdaeb24..000000000
--- a/res-xxhdpi/images/loop84.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop85.png b/res-xxhdpi/images/loop85.png
deleted file mode 100644
index 211098010..000000000
--- a/res-xxhdpi/images/loop85.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop86.png b/res-xxhdpi/images/loop86.png
deleted file mode 100644
index c402cecf4..000000000
--- a/res-xxhdpi/images/loop86.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop87.png b/res-xxhdpi/images/loop87.png
deleted file mode 100644
index 0d7ff318f..000000000
--- a/res-xxhdpi/images/loop87.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop88.png b/res-xxhdpi/images/loop88.png
deleted file mode 100644
index 754537d36..000000000
--- a/res-xxhdpi/images/loop88.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop89.png b/res-xxhdpi/images/loop89.png
deleted file mode 100644
index 68d4d6000..000000000
--- a/res-xxhdpi/images/loop89.png
+++ /dev/null
diff --git a/res-xxhdpi/images/loop90.png b/res-xxhdpi/images/loop90.png
deleted file mode 100644
index 9d6154452..000000000
--- a/res-xxhdpi/images/loop90.png
+++ /dev/null
diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png
index cc98bb18a..b7b61149e 100644
--- a/res-xxhdpi/images/no_command_text.png
+++ b/res-xxhdpi/images/no_command_text.png
diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png
index 612e7a390..c8117d318 100644
--- a/res-xxxhdpi/images/erasing_text.png
+++ b/res-xxxhdpi/images/erasing_text.png
diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png
index 50d2fadb5..4750b9834 100644
--- a/res-xxxhdpi/images/error_text.png
+++ b/res-xxxhdpi/images/error_text.png
diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png
new file mode 100644
index 000000000..83498092f
--- /dev/null
+++ b/res-xxxhdpi/images/installing_security_text.png
diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png
index 9bd093bf4..5bab8eb27 100644
--- a/res-xxxhdpi/images/installing_text.png
+++ b/res-xxxhdpi/images/installing_text.png
diff --git a/res-xxxhdpi/images/loop00.png b/res-xxxhdpi/images/loop00.png
index 76351c5a2..d360c79c5 100644
--- a/res-xxxhdpi/images/loop00.png
+++ b/res-xxxhdpi/images/loop00.png
diff --git a/res-xxxhdpi/images/loop01.png b/res-xxxhdpi/images/loop01.png
index acdefc064..a0b7ac665 100644
--- a/res-xxxhdpi/images/loop01.png
+++ b/res-xxxhdpi/images/loop01.png
diff --git a/res-xxxhdpi/images/loop02.png b/res-xxxhdpi/images/loop02.png
index 3fcb5e509..739c5805a 100644
--- a/res-xxxhdpi/images/loop02.png
+++ b/res-xxxhdpi/images/loop02.png
diff --git a/res-xxxhdpi/images/loop03.png b/res-xxxhdpi/images/loop03.png
index 47497a4a6..98a4890ad 100644
--- a/res-xxxhdpi/images/loop03.png
+++ b/res-xxxhdpi/images/loop03.png
diff --git a/res-xxxhdpi/images/loop04.png b/res-xxxhdpi/images/loop04.png
index 1867381a7..df6a09e34 100644
--- a/res-xxxhdpi/images/loop04.png
+++ b/res-xxxhdpi/images/loop04.png
diff --git a/res-xxxhdpi/images/loop05.png b/res-xxxhdpi/images/loop05.png
index 8b7574ccd..4d8d56de4 100644
--- a/res-xxxhdpi/images/loop05.png
+++ b/res-xxxhdpi/images/loop05.png
diff --git a/res-xxxhdpi/images/loop06.png b/res-xxxhdpi/images/loop06.png
index e3c0a7d33..c5f26f108 100644
--- a/res-xxxhdpi/images/loop06.png
+++ b/res-xxxhdpi/images/loop06.png
diff --git a/res-xxxhdpi/images/loop07.png b/res-xxxhdpi/images/loop07.png
deleted file mode 100644
index d783ca787..000000000
--- a/res-xxxhdpi/images/loop07.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop08.png b/res-xxxhdpi/images/loop08.png
deleted file mode 100644
index eefcb3f97..000000000
--- a/res-xxxhdpi/images/loop08.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop09.png b/res-xxxhdpi/images/loop09.png
deleted file mode 100644
index 0f82c269a..000000000
--- a/res-xxxhdpi/images/loop09.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop10.png b/res-xxxhdpi/images/loop10.png
deleted file mode 100644
index bc8624685..000000000
--- a/res-xxxhdpi/images/loop10.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop11.png b/res-xxxhdpi/images/loop11.png
deleted file mode 100644
index 7bd108746..000000000
--- a/res-xxxhdpi/images/loop11.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop12.png b/res-xxxhdpi/images/loop12.png
deleted file mode 100644
index b9dd44e36..000000000
--- a/res-xxxhdpi/images/loop12.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop13.png b/res-xxxhdpi/images/loop13.png
deleted file mode 100644
index 76c0d46bb..000000000
--- a/res-xxxhdpi/images/loop13.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop14.png b/res-xxxhdpi/images/loop14.png
deleted file mode 100644
index 03ff4bd83..000000000
--- a/res-xxxhdpi/images/loop14.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop15.png b/res-xxxhdpi/images/loop15.png
deleted file mode 100644
index b33cc28cb..000000000
--- a/res-xxxhdpi/images/loop15.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop16.png b/res-xxxhdpi/images/loop16.png
deleted file mode 100644
index cef8302bc..000000000
--- a/res-xxxhdpi/images/loop16.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop17.png b/res-xxxhdpi/images/loop17.png
deleted file mode 100644
index b1d6010fe..000000000
--- a/res-xxxhdpi/images/loop17.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop18.png b/res-xxxhdpi/images/loop18.png
deleted file mode 100644
index 2df58f03c..000000000
--- a/res-xxxhdpi/images/loop18.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop19.png b/res-xxxhdpi/images/loop19.png
deleted file mode 100644
index 0249bff35..000000000
--- a/res-xxxhdpi/images/loop19.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop20.png b/res-xxxhdpi/images/loop20.png
deleted file mode 100644
index 5968bbb1b..000000000
--- a/res-xxxhdpi/images/loop20.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop21.png b/res-xxxhdpi/images/loop21.png
deleted file mode 100644
index 76758e3a1..000000000
--- a/res-xxxhdpi/images/loop21.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop22.png b/res-xxxhdpi/images/loop22.png
deleted file mode 100644
index 7ab40f985..000000000
--- a/res-xxxhdpi/images/loop22.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop23.png b/res-xxxhdpi/images/loop23.png
deleted file mode 100644
index 830569f95..000000000
--- a/res-xxxhdpi/images/loop23.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop24.png b/res-xxxhdpi/images/loop24.png
deleted file mode 100644
index 4b8f77f3a..000000000
--- a/res-xxxhdpi/images/loop24.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop25.png b/res-xxxhdpi/images/loop25.png
deleted file mode 100644
index 83df09eeb..000000000
--- a/res-xxxhdpi/images/loop25.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop26.png b/res-xxxhdpi/images/loop26.png
deleted file mode 100644
index 4df09dce3..000000000
--- a/res-xxxhdpi/images/loop26.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop27.png b/res-xxxhdpi/images/loop27.png
deleted file mode 100644
index 0b211fe47..000000000
--- a/res-xxxhdpi/images/loop27.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop28.png b/res-xxxhdpi/images/loop28.png
deleted file mode 100644
index b40985b60..000000000
--- a/res-xxxhdpi/images/loop28.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop29.png b/res-xxxhdpi/images/loop29.png
deleted file mode 100644
index be5899de7..000000000
--- a/res-xxxhdpi/images/loop29.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop30.png b/res-xxxhdpi/images/loop30.png
deleted file mode 100644
index a7f95edf9..000000000
--- a/res-xxxhdpi/images/loop30.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop31.png b/res-xxxhdpi/images/loop31.png
deleted file mode 100644
index 1fe0bf3c1..000000000
--- a/res-xxxhdpi/images/loop31.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop32.png b/res-xxxhdpi/images/loop32.png
deleted file mode 100644
index 4bd34b4c7..000000000
--- a/res-xxxhdpi/images/loop32.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop33.png b/res-xxxhdpi/images/loop33.png
deleted file mode 100644
index c800b02db..000000000
--- a/res-xxxhdpi/images/loop33.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop34.png b/res-xxxhdpi/images/loop34.png
deleted file mode 100644
index 926b01089..000000000
--- a/res-xxxhdpi/images/loop34.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop35.png b/res-xxxhdpi/images/loop35.png
deleted file mode 100644
index 20f4cc1db..000000000
--- a/res-xxxhdpi/images/loop35.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop36.png b/res-xxxhdpi/images/loop36.png
deleted file mode 100644
index 36e4abec1..000000000
--- a/res-xxxhdpi/images/loop36.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop37.png b/res-xxxhdpi/images/loop37.png
deleted file mode 100644
index 424bb0993..000000000
--- a/res-xxxhdpi/images/loop37.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop38.png b/res-xxxhdpi/images/loop38.png
deleted file mode 100644
index 9e83b0f18..000000000
--- a/res-xxxhdpi/images/loop38.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop39.png b/res-xxxhdpi/images/loop39.png
deleted file mode 100644
index 37c65be71..000000000
--- a/res-xxxhdpi/images/loop39.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop40.png b/res-xxxhdpi/images/loop40.png
deleted file mode 100644
index 961342a7d..000000000
--- a/res-xxxhdpi/images/loop40.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop41.png b/res-xxxhdpi/images/loop41.png
deleted file mode 100644
index 28c4aac2a..000000000
--- a/res-xxxhdpi/images/loop41.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop42.png b/res-xxxhdpi/images/loop42.png
deleted file mode 100644
index 75adbba4e..000000000
--- a/res-xxxhdpi/images/loop42.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop43.png b/res-xxxhdpi/images/loop43.png
deleted file mode 100644
index 4ea659bb5..000000000
--- a/res-xxxhdpi/images/loop43.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop44.png b/res-xxxhdpi/images/loop44.png
deleted file mode 100644
index a36e0667d..000000000
--- a/res-xxxhdpi/images/loop44.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop45.png b/res-xxxhdpi/images/loop45.png
deleted file mode 100644
index f986268c7..000000000
--- a/res-xxxhdpi/images/loop45.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop46.png b/res-xxxhdpi/images/loop46.png
deleted file mode 100644
index 6b6d52ebf..000000000
--- a/res-xxxhdpi/images/loop46.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop47.png b/res-xxxhdpi/images/loop47.png
deleted file mode 100644
index 30c47f59d..000000000
--- a/res-xxxhdpi/images/loop47.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop48.png b/res-xxxhdpi/images/loop48.png
deleted file mode 100644
index 35c5801be..000000000
--- a/res-xxxhdpi/images/loop48.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop49.png b/res-xxxhdpi/images/loop49.png
deleted file mode 100644
index 849a8e830..000000000
--- a/res-xxxhdpi/images/loop49.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop50.png b/res-xxxhdpi/images/loop50.png
deleted file mode 100644
index fd48c653a..000000000
--- a/res-xxxhdpi/images/loop50.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop51.png b/res-xxxhdpi/images/loop51.png
deleted file mode 100644
index 9326afb6a..000000000
--- a/res-xxxhdpi/images/loop51.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop52.png b/res-xxxhdpi/images/loop52.png
deleted file mode 100644
index 7a1686553..000000000
--- a/res-xxxhdpi/images/loop52.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop53.png b/res-xxxhdpi/images/loop53.png
deleted file mode 100644
index 5d4db5bbe..000000000
--- a/res-xxxhdpi/images/loop53.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop54.png b/res-xxxhdpi/images/loop54.png
deleted file mode 100644
index ac12a5c50..000000000
--- a/res-xxxhdpi/images/loop54.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop55.png b/res-xxxhdpi/images/loop55.png
deleted file mode 100644
index 6a2cbc1ca..000000000
--- a/res-xxxhdpi/images/loop55.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop56.png b/res-xxxhdpi/images/loop56.png
deleted file mode 100644
index 5947d1864..000000000
--- a/res-xxxhdpi/images/loop56.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop57.png b/res-xxxhdpi/images/loop57.png
deleted file mode 100644
index dddc757fa..000000000
--- a/res-xxxhdpi/images/loop57.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop58.png b/res-xxxhdpi/images/loop58.png
deleted file mode 100644
index 5a7d24829..000000000
--- a/res-xxxhdpi/images/loop58.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop59.png b/res-xxxhdpi/images/loop59.png
deleted file mode 100644
index 34f68e8c6..000000000
--- a/res-xxxhdpi/images/loop59.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop60.png b/res-xxxhdpi/images/loop60.png
deleted file mode 100644
index 7c2b918a5..000000000
--- a/res-xxxhdpi/images/loop60.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop61.png b/res-xxxhdpi/images/loop61.png
deleted file mode 100644
index b27c4af1b..000000000
--- a/res-xxxhdpi/images/loop61.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop62.png b/res-xxxhdpi/images/loop62.png
deleted file mode 100644
index 36e1644d6..000000000
--- a/res-xxxhdpi/images/loop62.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop63.png b/res-xxxhdpi/images/loop63.png
deleted file mode 100644
index a8126270f..000000000
--- a/res-xxxhdpi/images/loop63.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop64.png b/res-xxxhdpi/images/loop64.png
deleted file mode 100644
index 97ff93099..000000000
--- a/res-xxxhdpi/images/loop64.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop65.png b/res-xxxhdpi/images/loop65.png
deleted file mode 100644
index 9d69ba7b2..000000000
--- a/res-xxxhdpi/images/loop65.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop66.png b/res-xxxhdpi/images/loop66.png
deleted file mode 100644
index 42d1a31f5..000000000
--- a/res-xxxhdpi/images/loop66.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop67.png b/res-xxxhdpi/images/loop67.png
deleted file mode 100644
index bff98b351..000000000
--- a/res-xxxhdpi/images/loop67.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop68.png b/res-xxxhdpi/images/loop68.png
deleted file mode 100644
index 5bfc75b5d..000000000
--- a/res-xxxhdpi/images/loop68.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop69.png b/res-xxxhdpi/images/loop69.png
deleted file mode 100644
index 488a245e0..000000000
--- a/res-xxxhdpi/images/loop69.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop70.png b/res-xxxhdpi/images/loop70.png
deleted file mode 100644
index 4a92b7bd1..000000000
--- a/res-xxxhdpi/images/loop70.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop71.png b/res-xxxhdpi/images/loop71.png
deleted file mode 100644
index b2206383a..000000000
--- a/res-xxxhdpi/images/loop71.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop72.png b/res-xxxhdpi/images/loop72.png
deleted file mode 100644
index 91c9d4448..000000000
--- a/res-xxxhdpi/images/loop72.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop73.png b/res-xxxhdpi/images/loop73.png
deleted file mode 100644
index 6cf94863d..000000000
--- a/res-xxxhdpi/images/loop73.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop74.png b/res-xxxhdpi/images/loop74.png
deleted file mode 100644
index d949bc0dc..000000000
--- a/res-xxxhdpi/images/loop74.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop75.png b/res-xxxhdpi/images/loop75.png
deleted file mode 100644
index 1b22bc91a..000000000
--- a/res-xxxhdpi/images/loop75.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop76.png b/res-xxxhdpi/images/loop76.png
deleted file mode 100644
index 09c8b8e93..000000000
--- a/res-xxxhdpi/images/loop76.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop77.png b/res-xxxhdpi/images/loop77.png
deleted file mode 100644
index 72fa8c890..000000000
--- a/res-xxxhdpi/images/loop77.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop78.png b/res-xxxhdpi/images/loop78.png
deleted file mode 100644
index d5cc7b209..000000000
--- a/res-xxxhdpi/images/loop78.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop79.png b/res-xxxhdpi/images/loop79.png
deleted file mode 100644
index 207c75a3f..000000000
--- a/res-xxxhdpi/images/loop79.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop80.png b/res-xxxhdpi/images/loop80.png
deleted file mode 100644
index d0b38d764..000000000
--- a/res-xxxhdpi/images/loop80.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop81.png b/res-xxxhdpi/images/loop81.png
deleted file mode 100644
index c8655eae1..000000000
--- a/res-xxxhdpi/images/loop81.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop82.png b/res-xxxhdpi/images/loop82.png
deleted file mode 100644
index fca1ad52a..000000000
--- a/res-xxxhdpi/images/loop82.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop83.png b/res-xxxhdpi/images/loop83.png
deleted file mode 100644
index ba1b1bfb0..000000000
--- a/res-xxxhdpi/images/loop83.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop84.png b/res-xxxhdpi/images/loop84.png
deleted file mode 100644
index 9bcf1dd3f..000000000
--- a/res-xxxhdpi/images/loop84.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop85.png b/res-xxxhdpi/images/loop85.png
deleted file mode 100644
index fb1e08be6..000000000
--- a/res-xxxhdpi/images/loop85.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop86.png b/res-xxxhdpi/images/loop86.png
deleted file mode 100644
index 9e2311eff..000000000
--- a/res-xxxhdpi/images/loop86.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop87.png b/res-xxxhdpi/images/loop87.png
deleted file mode 100644
index 4c6aee1cb..000000000
--- a/res-xxxhdpi/images/loop87.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop88.png b/res-xxxhdpi/images/loop88.png
deleted file mode 100644
index a40c5159d..000000000
--- a/res-xxxhdpi/images/loop88.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop89.png b/res-xxxhdpi/images/loop89.png
deleted file mode 100644
index c16adfbdc..000000000
--- a/res-xxxhdpi/images/loop89.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/loop90.png b/res-xxxhdpi/images/loop90.png
deleted file mode 100644
index 76351c5a2..000000000
--- a/res-xxxhdpi/images/loop90.png
+++ /dev/null
diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png
index 6354e6a99..955716fdb 100644
--- a/res-xxxhdpi/images/no_command_text.png
+++ b/res-xxxhdpi/images/no_command_text.png
diff --git a/screen_ui.cpp b/screen_ui.cpp
index b32df3649..55cb74120 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -146,7 +146,6 @@ void ScreenRecoveryUI::draw_background_locked() {
 // Should only be called with updateMutex locked.
 void ScreenRecoveryUI::draw_progress_locked() {
     if (currentIcon == ERROR) return;
-    if (progressBarType != DETERMINATE) return;
 
     if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) {
         GRSurface* frame = GetCurrentFrame();
diff --git a/tests/Android.mk b/tests/Android.mk
index 2da19d7a6..a66991b21 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -21,9 +21,13 @@ include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_MODULE := recovery_unit_test
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_STATIC_LIBRARIES := libverifier
+LOCAL_STATIC_LIBRARIES := \
+    libverifier \
+    libminui
+
 LOCAL_SRC_FILES := unit/asn1_decoder_test.cpp
 LOCAL_SRC_FILES += unit/recovery_test.cpp
+LOCAL_SRC_FILES += unit/locale_test.cpp
 LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_SHARED_LIBRARIES := liblog
 include $(BUILD_NATIVE_TEST)
diff --git a/tests/unit/locale_test.cpp b/tests/unit/locale_test.cpp
new file mode 100644
index 000000000..0e515f8c1
--- /dev/null
+++ b/tests/unit/locale_test.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include "minui/minui.h"
+
+TEST(LocaleTest, Misc) {
+    EXPECT_TRUE(matches_locale("zh_CN", "zh_CN_#Hans"));
+    EXPECT_TRUE(matches_locale("zh", "zh_CN_#Hans"));
+    EXPECT_FALSE(matches_locale("zh_HK", "zh_CN_#Hans"));
+    EXPECT_TRUE(matches_locale("en_GB", "en_GB"));
+    EXPECT_TRUE(matches_locale("en", "en_GB"));
+    EXPECT_FALSE(matches_locale("en_GB", "en"));
+    EXPECT_FALSE(matches_locale("en_GB", "en_US"));
+}