LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update Layout Animations samples to take the display's density into account." into froyo

Browse Source
This commit is contained in:
Romain Guy
2010-03-30 17:05:56 -07:00
committed by Android (Google) Code Review
parent 506e734d25 51344bdcff
commit 731afdbe2c
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation1.java
View File

@@ -59,7 +59,8 @@ public class LayoutAnimation1 extends Activity {
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
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;
}

3
samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation2.java
View File

@@ -47,8 +47,7 @@ public class LayoutAnimation2 extends ListActivity {
animation.setDuration(100);
set.addAnimation(animation);
LayoutAnimationController controller =
new LayoutAnimationController(set, 0.5f);
LayoutAnimationController controller = new LayoutAnimationController(set, 0.5f);
ListView listView = getListView();
listView.setLayoutAnimation(controller);
}

3
samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation4.java
View File

@@ -60,7 +60,8 @@ public class LayoutAnimation4 extends Activity {
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
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;
}

3
samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation5.java
View File

@@ -59,7 +59,8 @@ public class LayoutAnimation5 extends Activity {
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
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;
}

3
samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation6.java
View File

@@ -59,7 +59,8 @@ public class LayoutAnimation6 extends Activity {
i.setImageDrawable(info.activityInfo.loadIcon(getPackageManager()));
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;
}