зеркало из https://github.com/mozilla/gecko-dev.git
Bug 686694 - Remove library extraction splash screen. r=mfinkle
This commit is contained in:
Родитель
836ea80927
Коммит
c8451bd14f
|
@ -266,29 +266,8 @@ abstract public class GeckoApp
|
|||
|
||||
|
||||
}});
|
||||
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();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
<!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.">
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
]>
|
||||
<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>
|
||||
|
|
Загрузка…
Ссылка в новой задаче