wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 725389 - Set number of columns in top site's grid view onMeasure (r=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2012-05-08 11:44:48 +01:00
parent 017867d7c3
commit 565a5a48c0
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/AboutHomeContent.java
View File

@ -324,14 +324,6 @@ public class AboutHomeContent extends ScrollView
return NUMBER_OF_TOP_SITES_PORTRAIT;
}
private int getNumberOfColumns() {
Configuration config = getContext().getResources().getConfiguration();
if (config.orientation == Configuration.ORIENTATION_LANDSCAPE)
return NUMBER_OF_COLS_LANDSCAPE;
else
return NUMBER_OF_COLS_PORTRAIT;
}
private void loadTopSites(final Activity activity) {
// Ensure we initialize GeckoApp's startup mode in
// background thread before we use it when updating
@ -361,8 +353,6 @@ public class AboutHomeContent extends ScrollView
mTopSitesAdapter.changeCursor(mCursor);
}
mTopSitesGrid.setNumColumns(getNumberOfColumns());
updateLayout(startupMode, syncIsSetup);
}
});
@ -396,8 +386,6 @@ public class AboutHomeContent extends ScrollView
@Override
public void onConfigurationChanged(Configuration newConfig) {
if (mTopSitesGrid != null)
mTopSitesGrid.setNumColumns(getNumberOfColumns());
if (mTopSitesAdapter != null)
mTopSitesAdapter.notifyDataSetChanged();
@ -709,13 +697,16 @@ public class AboutHomeContent extends ScrollView
if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
nSites = Math.min(nSites, NUMBER_OF_TOP_SITES_LANDSCAPE);
numRows = (int) Math.round((double) nSites / NUMBER_OF_COLS_LANDSCAPE);
setNumColumns(NUMBER_OF_COLS_LANDSCAPE);
} else {
nSites = Math.min(nSites, NUMBER_OF_TOP_SITES_PORTRAIT);
numRows = (int) Math.round((double) nSites / NUMBER_OF_COLS_PORTRAIT);
setNumColumns(NUMBER_OF_COLS_PORTRAIT);
}
int expandedHeightSpec =
MeasureSpec.makeMeasureSpec((int)(mDisplayDensity * numRows * kTopSiteItemHeight),
MeasureSpec.EXACTLY);
super.onMeasure(widthMeasureSpec, expandedHeightSpec);
}
}