Merge "Test new fonts and use correct OS version." into jb-dev

This commit is contained in:
Daniel Sandler
2012-05-15 13:30:41 -07:00
committed by Android (Google) Code Review

View File

@@ -19,13 +19,17 @@ package com.android.internal.app;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator;
import android.view.MotionEvent;
import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
public class PlatLogoActivity extends Activity {
@@ -34,15 +38,65 @@ public class PlatLogoActivity extends Activity {
int mCount;
final Handler mHandler = new Handler();
private View makeView() {
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
LinearLayout view = new LinearLayout(this);
view.setOrientation(LinearLayout.VERTICAL);
view.setLayoutParams(
new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
));
final int p = (int)(8 * metrics.density);
view.setPadding(p, p, p, p);
Typeface light = Typeface.create("sans-serif-light", Typeface.NORMAL);
Typeface normal = Typeface.create("sans-serif", Typeface.BOLD);
final float size = 14 * metrics.density;
final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
lp.gravity = Gravity.CENTER_HORIZONTAL;
lp.bottomMargin = (int) (-4*metrics.density);
TextView tv = new TextView(this);
if (light != null) tv.setTypeface(light);
tv.setTextSize(1.25f*size);
tv.setTextColor(0xFFFFFFFF);
tv.setShadowLayer(4*metrics.density, 0, 2*metrics.density, 0x66000000);
tv.setText("Android " + Build.VERSION.RELEASE);
view.addView(tv, lp);
tv = new TextView(this);
if (normal != null) tv.setTypeface(normal);
tv.setTextSize(size);
tv.setTextColor(0xFFFFFFFF);
tv.setShadowLayer(4*metrics.density, 0, 2*metrics.density, 0x66000000);
tv.setText("JELLY BEAN");
view.addView(tv, lp);
return view;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mToast = Toast.makeText(this, "Android X.X: Jelly Bean", Toast.LENGTH_SHORT);
mToast = Toast.makeText(this, "", Toast.LENGTH_LONG);
mToast.setView(makeView());
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
mContent = new ImageView(this);
mContent.setImageResource(com.android.internal.R.drawable.platlogo);
mContent.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
final int p = (int)(32 * metrics.density);
mContent.setPadding(p, p, p, p);
mContent.setOnClickListener(new View.OnClickListener() {
@Override