Merge "Update Layout Animations samples to take the display's density into account." into froyo
This commit is contained in:
@@ -59,7 +59,8 @@ public class LayoutAnimation1 extends Activity {
|
|||||||
|
|
||||||
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
||||||
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
||||||
i.setLayoutParams(new GridView.LayoutParams(36, 36));
|
final int w = (int) (36 * getResources().getDisplayMetrics().density + 0.5f);
|
||||||
|
i.setLayoutParams(new GridView.LayoutParams(w, w));
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,8 +47,7 @@ public class LayoutAnimation2 extends ListActivity {
|
|||||||
animation.setDuration(100);
|
animation.setDuration(100);
|
||||||
set.addAnimation(animation);
|
set.addAnimation(animation);
|
||||||
|
|
||||||
LayoutAnimationController controller =
|
LayoutAnimationController controller = new LayoutAnimationController(set, 0.5f);
|
||||||
new LayoutAnimationController(set, 0.5f);
|
|
||||||
ListView listView = getListView();
|
ListView listView = getListView();
|
||||||
listView.setLayoutAnimation(controller);
|
listView.setLayoutAnimation(controller);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,8 @@ public class LayoutAnimation4 extends Activity {
|
|||||||
|
|
||||||
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
||||||
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
||||||
i.setLayoutParams(new GridView.LayoutParams(36, 36));
|
final int w = (int) (36 * getResources().getDisplayMetrics().density + 0.5f);
|
||||||
|
i.setLayoutParams(new GridView.LayoutParams(w, w));
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,8 @@ public class LayoutAnimation5 extends Activity {
|
|||||||
|
|
||||||
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
||||||
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
||||||
i.setLayoutParams(new GridView.LayoutParams(36, 36));
|
final int w = (int) (36 * getResources().getDisplayMetrics().density + 0.5f);
|
||||||
|
i.setLayoutParams(new GridView.LayoutParams(w, w));
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,8 @@ public class LayoutAnimation6 extends Activity {
|
|||||||
|
|
||||||
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
|
||||||
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
|
||||||
i.setLayoutParams(new GridView.LayoutParams(36, 36));
|
final int w = (int) (36 * getResources().getDisplayMetrics().density + 0.5f);
|
||||||
|
i.setLayoutParams(new GridView.LayoutParams(w, w));
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user