Show logo in splash screen.

briar-android/src/org/briarproject/android/SplashScreenActivity.java

@@ -8,14 +8,17 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.briarproject.R;
+import org.briarproject.android.util.LayoutUtils;
 import org.briarproject.api.db.DatabaseConfig;
 
 import roboguice.RoboGuice;
 import roboguice.activity.RoboSplashActivity;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 
 import com.google.inject.Injector;
 
@@ -30,7 +33,7 @@ public class SplashScreenActivity extends RoboSplashActivity {
 	private long start = System.currentTimeMillis();
 
 	public SplashScreenActivity() {
-		minDisplayMs = 0;
+		minDisplayMs = 500;
 	}
 
 	@Override
@@ -40,9 +43,12 @@ public class SplashScreenActivity extends RoboSplashActivity {
 		LinearLayout layout = new LinearLayout(this);
 		layout.setLayoutParams(MATCH_MATCH);
 		layout.setGravity(CENTER);
-		ProgressBar spinner = new ProgressBar(this);
-		spinner.setIndeterminate(true);
-		layout.addView(spinner);
+		layout.setBackgroundColor(Color.WHITE);
+		int pad = LayoutUtils.getLargeItemPadding(this);
+		ImageView logo = new ImageView(this);
+		logo.setPadding(pad, pad, pad, pad);
+		logo.setImageResource(R.drawable.briar_logo_large);
+		layout.addView(logo);
 		setContentView(layout);
 	}
 

briar-android/src/org/briarproject/android/util/LayoutUtils.java

@@ -8,17 +8,26 @@ import android.view.WindowManager;
 public class LayoutUtils {
 
 	public static int getSeparatorWidth(Context ctx) {
-		return Math.max(2, getMaxDisplayDimension(ctx) / 100 - 6);
+		DisplayMetrics metrics = getDisplayMetrics(ctx);
+		int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;
+		return Math.max(2, percent - 6);
 	}
 
 	public static int getPadding(Context ctx) {
-		return getMaxDisplayDimension(ctx) / 100 + 7;
+		DisplayMetrics metrics = getDisplayMetrics(ctx);
+		int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;
+		return percent + 7;
 	}
 
-	private static int getMaxDisplayDimension(Context ctx) {
+	public static int getLargeItemPadding(Context ctx) {
+		DisplayMetrics metrics = getDisplayMetrics(ctx);
+		return Math.min(metrics.widthPixels, metrics.heightPixels) / 4;
+	}
+
+	private static DisplayMetrics getDisplayMetrics(Context ctx) {
 		DisplayMetrics metrics = new DisplayMetrics();
 		WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE);
 		wm.getDefaultDisplay().getMetrics(metrics);
-		return Math.max(metrics.widthPixels, metrics.heightPixels);
+		return metrics;
 	}
 }