Revert "Remove new calculation of cell size"

This reverts commit 9a00e21468b9d02c719a5663f4b8a539567785e2.
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	src/com/cyanogenmod/trebuchet/Workspace.java
	src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java

Change-Id: I287605c25006d2baf4066ca91c9eb4b2be9d3564
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	res/values/cm_strings.xml

Change-Id: I817a4423461e8474c06c92b7a219c66ffd423f9e
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Trebuchet: FR translation

Change-Id: I742c59447720d375e4f5719f70c34362b607ac7a
Trebuchet: PT-BR update translations

Change-Id: Ie501afdd1338b72c9c762ed6f413c52f69d05a2c
Trebuchet: AF translations

Change-Id: I2b6d339f1e0905d4d1ca690998326bbd8ff0cd83
Merge "Trebuchet: FR translation" into cm-10.2
Trebuchet : Check item placement when setting defaultWorkspace

In its current state, the launcher blindly adds any item specified
in the default workspace (even those that overlap). Consequently, it
throws an error each time it tries to load the database.

This patchset addresses that by dismissing insertion of overlapping items.
This allows for fallbacks to be specified in the default_workspace.xml

Change-Id: I08a6bd699defb908565ca2f47c855516eecf5643
Trebuchet : Use standard android action

Applications expect "com.android.launcher.action.APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE"
and not the renamed trebuchet version, which breaks default workspace configuration
for widgets.

Change-Id: Idf7409760d49df2868711350faa0e5a66d3c87a5
Merge "Trebuchet : Use standard android action" into cm-10.2
Merge "Trebuchet : Check item placement when setting defaultWorkspace" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Trebuchet : Default workspace init fix

Preload receiver might be invoked by setup wizard prior
to workspace being initialized in which case, the instance fields
we're interested in don't populate. This patchset addresses that,
by directly querying the values rather than relying on them to be instantiated.

Change-Id: I5be2e04022244dbe429632d6baae118c02c1419f
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2