am a1ae3c09: Merge "Fixing issue where smallest screen dim was not taking dpi into account." into ics-scoop

* commit 'a1ae3c0992c256671b8daf5101e8e2051e32686a':
  Fixing issue where smallest screen dim was not taking dpi into account.
This commit is contained in:
Andrew Flynn 2012-02-15 18:35:46 -08:00 committed by Android Git Automerger
commit 816e1f7c1b
1 changed files with 3 additions and 1 deletions

View File

@ -279,9 +279,11 @@ public class Workspace extends SmoothPagedView
// landscape
TypedArray actionBarSizeTypedArray =
context.obtainStyledAttributes(new int[] { android.R.attr.actionBarSize });
DisplayMetrics displayMetrics = res.getDisplayMetrics();
final float actionBarHeight = actionBarSizeTypedArray.getDimension(0, 0f);
final float systemBarHeight = res.getDimension(R.dimen.status_bar_height);
final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp;
final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp *
displayMetrics.density;
cellCountX = 1;
while (CellLayout.widthInPortrait(res, cellCountX + 1) <= smallestScreenDim) {