@@ -60,6 +60,7 @@ import android.view.MenuItem; import android.view.SubMenu; import android.view.View; import android.view.Window; +import android.view.animation.AlphaAnimation; import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.Button; @@ -67,6 +68,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.ViewAnimator; /** * Class that controls a mobile Titanium application. @@ -108,7 +110,7 @@ public class TitaniumActivity extends Activity private HashSet<OnConfigChange> configurationChangeListeners; private TitaniumLogWatcher logWatcher; - private FrameLayout layout; + private ViewAnimator layout; private Drawable backgroundDrawable; private String url; @@ -193,7 +195,12 @@ public class TitaniumActivity extends Activity }}); sourceLoadThread.start(); - layout = new FrameLayout(this); + layout = new ViewAnimator(this); + layout.setAnimateFirstView(true); + AlphaAnimation inAnim = new AlphaAnimation(0.0f, 1.0f); + inAnim.setDuration(200); + layout.setInAnimation(inAnim); + settings = webView.getSettings(); configurationChangeListeners = new HashSet<OnConfigChange>(); @@ -228,6 +235,7 @@ public class TitaniumActivity extends Activity public void run() { buildWebView(); }}); + webViewThread.setPriority(Thread.MAX_PRIORITY); webViewThread.start(); initialOrientation = this.getRequestedOrientation(); @@ -308,7 +316,8 @@ public class TitaniumActivity extends Activity ((BitmapDrawable) backgroundDrawable).setGravity(Gravity.TOP); splashView.setImageDrawable(backgroundDrawable); } - setContentView(splashView); + layout.addView(splashView); + setContentView(layout); ts("After splash"); @@ -618,7 +627,8 @@ public class TitaniumActivity extends Activity handler.post(new Runnable(){ public void run() { layout.addView(me.webView); - me.setContentView(layout); + layout.showNext(); + layout.removeView(splashView); ts("webview is content"); if (!me.webView.hasFocus()) { android/titanium/src/org/appcelerator/titanium/TitaniumActivity.java @@ -69,21 +69,43 @@ public class TitaniumActivityGroup extends ActivityGroup final ArrayList<TitaniumWindowInfo> windows = appInfo.getWindows(); - TitaniumWindowInfo info = windows.get(0); + final TitaniumWindowInfo info = windows.get(0); final TitaniumFileHelper tfh = new TitaniumFileHelper(this.getApplicationContext()); - Thread sourceThread = new Thread(new Runnable(){ + Thread initialSourceThread = new Thread(new Runnable(){ public void run() { - for (TitaniumWindowInfo wi : windows) { - String url = tfh.getResourceUrl(null, wi.getWindowUrl()); - try { - app.setSourceFor(url, TitaniumUrlHelper.getSource(app, app.getApplicationContext(), url, null)); - } catch (IOException e) { - Log.e(LCAT, "Unable to pre-load source for " + url); - } + String url = tfh.getResourceUrl(null, info.getWindowUrl()); + try { + app.setSourceFor(url, TitaniumUrlHelper.getSource(app, app.getApplicationContext(), url, null)); + } catch (IOException e) { + Log.e(LCAT, "Unable to pre-load source for " + url); } }}); - sourceThread.start(); + initialSourceThread.setPriority(Thread.NORM_PRIORITY); + initialSourceThread.start(); + + final int len = windows.size(); + + if (len > 1) { + Thread sourceThread = new Thread(new Runnable(){ + public void run() { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + Log.w(LCAT, "Secondary source cache thread interrupted"); + } + for (int i = 1; i < len; i++) { + String url = tfh.getResourceUrl(null, windows.get(i).getWindowUrl()); + try { + app.setSourceFor(url, TitaniumUrlHelper.getSource(app, app.getApplicationContext(), url, null)); + } catch (IOException e) { + Log.e(LCAT, "Unable to pre-load source for " + url); + } + } + }}); + sourceThread.setPriority(Thread.MIN_PRIORITY); + sourceThread.start(); + } if (info.isWindowFullscreen()) { this.requestWindowFeature(Window.FEATURE_NO_TITLE); android/titanium/src/org/appcelerator/titanium/TitaniumActivityGroup.java @@ -156,7 +156,7 @@ public class TitaniumAnalyticsService extends Service } } }); - + t.setPriority(Thread.MIN_PRIORITY); t.start(); } android/titanium/src/org/appcelerator/titanium/TitaniumAnalyticsService.java @@ -52,6 +52,8 @@ public class TitaniumTabbedAppStrategy implements ITitaniumAppStrategy tabHost.setup(tag.getLocalActivityManager()); ArrayList<TitaniumWindowInfo> windows = app.getAppInfo().getWindows(); + boolean addedToContentView = false; + int len = windows.size(); for (int i = 0; i < len; i++) { TitaniumWindowInfo info = windows.get(i); @@ -97,9 +99,13 @@ public class TitaniumTabbedAppStrategy implements ITitaniumAppStrategy spec.setContent(tabIntent.getIntent()); tabHost.addTab(spec); + + if (!addedToContentView) { + tag.setContentView(tabHost,linearParams); + addedToContentView = true; + } } - tag.setContentView(tabHost,linearParams); } } android/titanium/src/org/appcelerator/titanium/TitaniumTabbedAppStrategy.java 442daa5ed41d766941fed75deb7ed4fa48f2314c donthorp don@donthorp.net http://github.com/appcelerator/titanium_mobile/commit/5d894e5f2bc442dda92f67c8d0857a1818be0e85 5d894e5f2bc442dda92f67c8d0857a1818be0e85 2009-06-25T10:48:09-07:00 2009-06-25T10:48:09-07:00 Tuning of loading to try and dimish slow load perception bd897fd0ed881bbae0098271f42d1f43fcbd1ab5 donthorp don@donthorp.net