During first run, or when the lastScreen.png is missing, we currently show a black screen. I am changing this to display a stock image with some text over it. We should think about exactly what we want to show here.

This commit is contained in:
Doug Turner 2011-10-11 22:08:42 -07:00
Родитель cd4516cf37
Коммит 6e9ab4a9d5
3 изменённых файлов: 15 добавлений и 8 удалений

Просмотреть файл

@ -125,10 +125,6 @@ class GeckoSurfaceView
if (mStartupBitmap == null) { if (mStartupBitmap == null) {
Log.e(LOG_FILE_NAME, "!!! NO STARTUP BITMAP !!!"); Log.e(LOG_FILE_NAME, "!!! NO STARTUP BITMAP !!!");
loadStartupBitmap(); loadStartupBitmap();
if (mStartupBitmap == null) {
mShowingLoadScreen = false;
return;
}
} }
Canvas c = holder.lockCanvas(); Canvas c = holder.lockCanvas();
@ -138,9 +134,19 @@ class GeckoSurfaceView
return; return;
} }
Drawable drawable = new BitmapDrawable(mStartupBitmap); if (mStartupBitmap == null) {
drawable.setBounds(0, 0, width, height); Resources res = getResources();
drawable.draw(c); Drawable drawable = res.getDrawable(R.drawable.start);
drawable.setBounds(0, 0, width, height);
drawable.draw(c);
Paint paint = new Paint();
c.drawText("Place holder. Missing screenshot.", 10.0f, 20.0f, paint);
} else {
Drawable drawable = new BitmapDrawable(mStartupBitmap);
drawable.setBounds(0, 0, width, height);
drawable.draw(c);
}
holder.unlockCanvasAndPost(c); holder.unlockCanvasAndPost(c);
} }

Просмотреть файл

@ -150,9 +150,10 @@ RES_LAYOUT += res/layout/crash_reporter.xml
endif endif
MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/desktop_notification.png \ MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/desktop_notification.png \
embedding/android/resources/drawable/favicon.png \ embedding/android/resources/drawable/favicon.png \
embedding/android/resources/drawable/reload.png \ embedding/android/resources/drawable/reload.png \
embedding/android/resources/drawable/quit.png \ embedding/android/resources/drawable/quit.png \
embedding/android/resources/drawable/start.png \
embedding/android/resources/drawable/address_bar_button_left.9.png \ embedding/android/resources/drawable/address_bar_button_left.9.png \
embedding/android/resources/drawable/address_bar_button_right.9.png \ embedding/android/resources/drawable/address_bar_button_right.9.png \
embedding/android/resources/drawable/address_bar_button_middle.9.png \ embedding/android/resources/drawable/address_bar_button_middle.9.png \

Двоичные данные
embedding/android/resources/drawable/start.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 5.7 KiB