Bug 686528 - (4 of 5) kTopSiteHeight in AboutHomeContent uses a dimen constant. r=sriram

mobile/android/base/AboutHomeContent.java

@@ -626,22 +626,8 @@ public class AboutHomeContent extends ScrollView
     }
 
     public static class TopSitesGridView extends GridView {
-        /** From layout xml:
-         *  80dip image height 
-         * + 2dip image paddingTop
-         * + 1dip image padding (for bottom)
-         * + 3dip marginTop on the TextView
-         * +15dip TextView height
-         * + 8dip vertical spacing in the GridView
-         * ------
-         * 109dip total height per top site grid item
-         */
-        private static final int kTopSiteItemHeight = 109;
-        float mDisplayDensity ;
-
         public TopSitesGridView(Context context, AttributeSet attrs) {
             super(context, attrs);
-            mDisplayDensity = context.getResources().getDisplayMetrics().density;
         }
 
         @Override
@@ -661,9 +647,9 @@ public class AboutHomeContent extends ScrollView
             numRows = (int) Math.round((double) nSites / mNumberOfCols);
             setNumColumns(mNumberOfCols);
 
-            int expandedHeightSpec = 
+            int expandedHeightSpec = MeasureSpec.makeMeasureSpec(numRows * getResources().
-                MeasureSpec.makeMeasureSpec((int)(mDisplayDensity * numRows * kTopSiteItemHeight),
+                    getDimensionPixelSize(R.dimen.abouthome_content_top_sites_item_height),
-                                            MeasureSpec.EXACTLY);
+                    MeasureSpec.EXACTLY);
 
             super.onMeasure(widthMeasureSpec, expandedHeightSpec);
         }

mobile/android/base/resources/values/dimens.xml

@@ -7,6 +7,7 @@
 
     <dimen name="abouthome_gutter_small">0dp</dimen>
     <dimen name="abouthome_gutter_large">0dp</dimen>
+    <dimen name="abouthome_content_top_sites_item_height">106dp</dimen>
     <dimen name="autocomplete_min_width">200dp</dimen>
     <dimen name="autocomplete_row_height">32dp</dimen>
     <dimen name="awesomebar_header_row_height">20dp</dimen>