diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | d784b52040dc1d688b5f98c186038ab188669040 (patch) | |
| tree | 27d8940569edd2e0ff30d1f5f8b174551675943d /src/com/android/launcher3/CellLayout.java | |
| parent | 5dc390cde4aa6efc41e145610bb993e4754fd440 (diff) | |
| download | android_packages_apps_Trebuchet-d784b52040dc1d688b5f98c186038ab188669040.tar.gz android_packages_apps_Trebuchet-d784b52040dc1d688b5f98c186038ab188669040.tar.bz2 android_packages_apps_Trebuchet-d784b52040dc1d688b5f98c186038ab188669040.zip | |
Customizeable Dynamic Grid:
- Presets
- Comfortable (+0)
- Cozy (+1)
- Condensed (+2)
- Custom option with min, max
Reordering items in the settings pane for better organization
Modifying Settings Layout for readability
Conflicts:
res/layout/settings_pane_list_item.xml
res/values/cm_strings.xml
src/com/android/launcher3/DeviceProfile.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 0ff1ef4ad..131d638aa 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -3049,7 +3049,8 @@ out: for (int i = x; i < x + spanX - 1 && x < xCount; i++) { if (x < mCountX && y < mCountY) { return mOccupied[x][y]; } else { - throw new RuntimeException("Position exceeds the bound of this CellLayout"); + Log.w(TAG, "Position exceeds the bound of this CellLayout"); + return false; } } |