Bug 686694 - Remove library extraction splash screen. r=mfinkle
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 16 Sep 2011 11:15:43 +0200
changeset 78323 f4d78560721a8a0853da170db77a8d71ec950904
parent 78322 ad202468df6335badd1c44be9913975a1a6099d8
child 78358 88b093bae9514a482d477368dfd54626df7adb94
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs686694
milestone9.0a1
first release with
nightly linux32
f4d78560721a / 9.0a1 / 20110916071142 / files
nightly linux64
f4d78560721a / 9.0a1 / 20110916071142 / files
nightly mac
f4d78560721a / 9.0a1 / 20110916071142 / files
nightly win32
f4d78560721a / 9.0a1 / 20110916071142 / files
nightly win64
f4d78560721a / 9.0a1 / 20110916071142 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 686694 - Remove library extraction splash screen. r=mfinkle
embedding/android/GeckoApp.java
embedding/android/locales/en-US/android_strings.dtd
embedding/android/strings.xml.in
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -261,39 +261,18 @@ abstract public class GeckoApp
                 Locale.setDefault(locale);
                 Resources res = getBaseContext().getResources();
                 Configuration config = res.getConfiguration();
                 config.locale = locale;
                 res.updateConfiguration(config, res.getDisplayMetrics());
 
 
             }});
-        File cacheFile = GeckoAppShell.getCacheDir();
-        File libxulFile = new File(cacheFile, "libxul.so");
-
-        if (GeckoAppShell.getFreeSpace() > GeckoAppShell.kFreeSpaceThreshold &&
-            (!libxulFile.exists() ||
-             new File(getApplication().getPackageResourcePath()).lastModified()
-             >= libxulFile.lastModified())) {
-            surfaceView.mSplashStatusMsg =
-                getResources().getString(R.string.splash_screen_installing_libs);
-            File[] libs = cacheFile.listFiles(new FilenameFilter() {
-                public boolean accept(File dir, String name) {
-                    return name.endsWith(".so");
-                }
-            });
-            if (libs != null) {
-                for (int i = 0; i < libs.length; i++) {
-                    libs[i].delete();
-                }
-            }
-        } else {
-            surfaceView.mSplashStatusMsg =
-                getResources().getString(R.string.splash_screen_loading);
-        }
+        surfaceView.mSplashStatusMsg =
+            getResources().getString(R.string.splash_screen_loading);
         mLibLoadThread.start();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         if (checkLaunchState(LaunchState.GeckoExiting)) {
             // We're exiting and shouldn't try to do anything else just incase
             // we're hung for some reason we'll force the process to exit
--- a/embedding/android/locales/en-US/android_strings.dtd
+++ b/embedding/android/locales/en-US/android_strings.dtd
@@ -1,11 +1,10 @@
 
 <!ENTITY  splash_screen_loading "Loading">
-<!ENTITY  splash_screen_installing_libs "Installing libraries\u2026">
 <!ENTITY  splash_firstrun "Setting up &brandShortName;\u2026">
 
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
 <!ENTITY  crash_reporter_title "&brandShortName; Crash Reporter">
 <!ENTITY  crash_message "&brandShortName; has crashed. Your tabs should be listed on the &brandShortName; Start page when you restart.">
 <!ENTITY  crash_help_message "Please help us fix this problem!">
--- a/embedding/android/strings.xml.in
+++ b/embedding/android/strings.xml.in
@@ -1,17 +1,16 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
 ]>
 <resources>
   <string name="splash_screen_loading">&splash_screen_loading;</string>
-  <string name="splash_screen_installing_libs">&splash_screen_installing_libs;</string>
   <string name="splash_firstrun">&splash_firstrun;</string>
   <string name="no_space_to_start_error">&no_space_to_start_error;</string>
   <string name="error_loading_file">&error_loading_file;</string>
 
   <string name="crash_reporter_title">&crash_reporter_title;</string>
   <string name="crash_message">&crash_message;</string>
   <string name="crash_help_message">&crash_help_message;</string>
   <string name="crash_send_report_message">&crash_send_report_message;</string>